nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-23 04:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #93 from encounter/fix/stage2-args

Browse source 
Fix stage2_args_t mismatch
This commit is contained in:
TuxSH 2018-05-11 23:38:25 +02:00 committed by GitHub
commit 4ada3b6195
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fusee/fusee-primary/src/init.c
View file

@ -90,7 +90,7 @@ static void __program_parse_argc_argv(int argc, char *argdata) {
strcpy((char *)__program_argv[0], argdata); strcpy((char *)__program_argv[0], argdata);
pos += len + 1; pos += len + 1;
__program_argv[1] = malloc(len + 1); __program_argv[1] = malloc(sizeof(stage2_args_t));
if (__program_argv[1] == NULL) { if (__program_argv[1] == NULL) {
generic_panic(); generic_panic();
} }

3
fusee/fusee-primary/src/stage2.h
View file

@ -21,9 +21,6 @@ typedef struct {
typedef struct { typedef struct {
uint32_t version; uint32_t version;
uint32_t *lfb;
uint32_t console_row;
uint32_t console_col;
char bct0[BCTO_MAX_SIZE]; char bct0[BCTO_MAX_SIZE];
} stage2_args_t; } stage2_args_t;

2
fusee/fusee-secondary/src/init.c
View file

@ -90,7 +90,7 @@ static void __program_parse_argc_argv(int argc, char *argdata) {
strcpy((char *)__program_argv[0], argdata); strcpy((char *)__program_argv[0], argdata);
pos += len + 1; pos += len + 1;
__program_argv[1] = malloc(len + 1); __program_argv[1] = malloc(sizeof(stage2_args_t));
if (__program_argv[1] == NULL) { if (__program_argv[1] == NULL) {
generic_panic(); generic_panic();
} }