Merge pull request #17729 from pstef/limit-stack-usage

Author: LibretroAdmin

command.c

@@ -743,13 +743,12 @@ bool command_show_osd_msg(command_t *cmd, const char* arg)
 
 bool command_load_state_slot(command_t *cmd, const char *arg)
 {
-   char state_path[16384];
+   char state_path[PATH_MAX_LENGTH] = "";
    size_t _len                  = 0;
    char reply[128]              = "";
    unsigned int slot            = (unsigned int)strtoul(arg, NULL, 10);
    bool savestates_enabled      = core_info_current_supports_savestate();
    bool ret                     = false;
-   state_path[0]                = '\0';
    _len  = strlcpy(reply, "LOAD_STATE_SLOT ", sizeof(reply));
    _len += snprintf(reply + _len, sizeof(reply) - _len, "%d", slot);
    if (savestates_enabled)
@@ -1362,7 +1361,7 @@ void command_event_init_cheats(
 
 bool command_event_load_entry_state(settings_t *settings)
 {
-   char entry_state_path[PATH_MAX_LENGTH];
+   char entry_state_path[PATH_MAX_LENGTH] = "";
    int entry_path_stats;
    runloop_state_t *runloop_st     = runloop_state_get_ptr();
    bool ret                        = false;
@@ -1379,8 +1378,6 @@ bool command_event_load_entry_state(settings_t *settings)
       return false;
 #endif
 
-   entry_state_path[0] = '\0';
-
    if (!runloop_get_entry_state_path(
          entry_state_path, sizeof(entry_state_path),
          runloop_st->entry_state_slot))
@@ -2112,15 +2109,13 @@ void command_event_remove_current_config(enum override_type type)
 
 bool command_event_main_state(unsigned cmd)
 {
-   char msg[128];
-   char state_path[16384]; /* TODO/FIXME - reduce this */
+   char msg[128]               = "";
+   char state_path[PATH_MAX_LENGTH] = "";
    size_t _len                 = 0;
    settings_t *settings        = config_get_ptr();
    bool savestates_enabled     = core_info_current_supports_savestate();
    bool ret                    = false;
 
-   state_path[0] = msg[0]      = '\0';
-
    if (savestates_enabled)
    {
       size_t info_size;

tasks/task_database_cue.c

@@ -187,14 +187,18 @@ int detect_ps1_game(intfstream_t *fd, char *s, size_t len, const char *filename)
 {
    int pos;
    char raw_game_id[50];
-   char disc_data[DISC_DATA_SIZE_PS1];
+   char *disc_data = malloc(DISC_DATA_SIZE_PS1);
 
-   /* Load data into buffer and use pointers */
-   if (intfstream_seek(fd, 0, SEEK_SET) < 0)
+   if (!disc_data)
       return false;
 
-   if (intfstream_read(fd, disc_data, DISC_DATA_SIZE_PS1) <= 0)
+   /* Load data into buffer and use pointers */
+   if (intfstream_seek(fd, 0, SEEK_SET) < 0
+      || intfstream_read(fd, disc_data, DISC_DATA_SIZE_PS1) <= 0)
+   {
+      free(disc_data);
       return false;
+   }
 
    disc_data[DISC_DATA_SIZE_PS1 - 1] = '\0';
 
@@ -238,6 +242,7 @@ int detect_ps1_game(intfstream_t *fd, char *s, size_t len, const char *filename)
 
             string_remove_all_whitespace(s, raw_game_id);
             cue_append_multi_disc_suffix(s, filename);
+            free(disc_data);
             return true;
          }
       }
@@ -247,6 +252,7 @@ int detect_ps1_game(intfstream_t *fd, char *s, size_t len, const char *filename)
 
          string_remove_all_whitespace(s, raw_game_id);
          cue_append_multi_disc_suffix(s, filename);
+         free(disc_data);
          return true;
       }
       else if (string_is_equal_fast(raw_game_id, "PSX.EXE", STRLEN_CONST("PSX.EXE")))
@@ -255,6 +261,7 @@ int detect_ps1_game(intfstream_t *fd, char *s, size_t len, const char *filename)
 
          string_remove_all_whitespace(s, raw_game_id);
          cue_append_multi_disc_suffix(s, filename);
+         free(disc_data);
          return false;
       }
    }
@@ -271,6 +278,7 @@ int detect_ps1_game(intfstream_t *fd, char *s, size_t len, const char *filename)
    s[9 ] = 'X';
    s[10] = '\0';
    cue_append_multi_disc_suffix(s, filename);
+   free(disc_data);
    return false;
 }
 
@@ -404,14 +412,18 @@ int detect_psp_game(intfstream_t *fd, char *s, size_t len, const char *filename)
 {
    #define DISC_DATA_SIZE_PSP 40000
    int pos;
-   char disc_data[DISC_DATA_SIZE_PSP];
+   char *disc_data = malloc(DISC_DATA_SIZE_PSP);
 
-   /* Load data into buffer and use pointers */
-   if (intfstream_seek(fd, 0, SEEK_SET) < 0)
+   if (!disc_data)
       return false;
 
-   if (intfstream_read(fd, disc_data, DISC_DATA_SIZE_PSP) <= 0)
+   /* Load data into buffer and use pointers */
+   if (intfstream_seek(fd, 0, SEEK_SET) < 0
+      || intfstream_read(fd, disc_data, DISC_DATA_SIZE_PSP) <= 0)
+   {
+      free(disc_data);
       return false;
+   }
 
    disc_data[DISC_DATA_SIZE_PSP - 1] = '\0';
 
@@ -455,11 +467,13 @@ int detect_psp_game(intfstream_t *fd, char *s, size_t len, const char *filename)
             )
          {
             cue_append_multi_disc_suffix(s, filename);
+            free(disc_data);
             return true;
          }
       }
    }
 
+   free(disc_data);
    return false;
 }