Skip to content

Commit e26fd87

Browse files
committed
correct malloc bugs in saved names
Signed-off-by: Vincent-FK <vincent.buso@funkey-project.com>
1 parent 76968c0 commit e26fd87

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

menu/main.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,8 @@ void parse_cmd_line(int argc, char *argv[])
986986
if (f) {
987987

988988
/* Save Rom path */
989-
mRomPath = strdup(mRomName);
989+
mRomPath = (char*)malloc(strlen(mRomName)+1);
990+
strcpy(mRomPath, mRomName);
990991
char *slash = strrchr ((char*)mRomPath, '/');
991992
*slash = 0;
992993

@@ -998,7 +999,9 @@ void parse_cmd_line(int argc, char *argv[])
998999
quick_save_file = (char*) malloc(strlen(mRomPath) + strlen(slash+1) + strlen(quick_save_file_extension) + 2 + 1);
9991000
sprintf(quick_save_file, "%s/%s.%s",
10001001
mRomPath, slash+1, quick_save_file_extension);
1001-
//printf("************ quick_save_file: %s\n", quick_save_file);
1002+
/*printf("************ quick_save_file: %s\n", quick_save_file);
1003+
printf("************ mRomPath: %s\n", mRomPath);
1004+
printf("************ mRomName: %s\n", mRomName);*/
10021005

10031006
fclose(f);
10041007
}
@@ -1031,7 +1034,6 @@ int mainEntry(int argc, char* argv[])
10311034
signal(SIGUSR1, handle_sigusr1);
10321035

10331036
/* Parse arguments */
1034-
mRomName[0]=0;
10351037
if (argc >= 2){
10361038
parse_cmd_line(argc, argv);
10371039
}

menu/menu.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2573,6 +2573,7 @@ void MenuInit(const char *systemDir, struct MENU_OPTIONS *menuOptions, char *rom
25732573

25742574
//strcpy(mSystemDir,systemDir);
25752575
strcpy(mSystemDir,mRomPath);
2576+
//printf("******* %s\n", mSystemDir);
25762577
mMenuOptions=menuOptions;
25772578

25782579
if(LoadMenuOptions(mSystemDir, DEFAULT_ROM_DIR_FILENAME, DEFAULT_ROM_DIR_EXT, mRomDir, SAL_MAX_PATH, 0)!=SAL_OK)

0 commit comments

Comments
 (0)