diff --git a/core_info.c b/core_info.c
index 9bc4b10f49..e16a4d4748 100644
--- a/core_info.c
+++ b/core_info.c
@@ -45,8 +45,24 @@ static void core_info_list_resolve_all_extensions(
       core_info_list_t *core_info_list)
 {
    size_t i              = 0;
+   size_t all_ext_len    = 0;
+   char *all_ext         = NULL;
 
-   core_info_list->all_ext[0] = '\0';
+   for (i = 0; i < core_info_list->count; i++)
+   {
+      if (core_info_list->list[i].supported_extensions)
+         all_ext_len +=
+            (strlen(core_info_list->list[i].supported_extensions) + 2);
+   }
+
+   all_ext_len += STRLEN_CONST("7z|") + STRLEN_CONST("zip|");
+
+   all_ext      = (char*)calloc(1, all_ext_len);
+
+   if (!all_ext)
+      return;
+
+   core_info_list->all_ext = all_ext;
 
    for (i = 0; i < core_info_list->count; i++)
    {
@@ -54,8 +70,7 @@ static void core_info_list_resolve_all_extensions(
          continue;
 
       strlcat(core_info_list->all_ext,
-            core_info_list->list[i].supported_extensions,
-            sizeof(core_info_list->all_ext));
+            core_info_list->list[i].supported_extensions, all_ext_len);
       string_concat(core_info_list->all_ext, "|");
    }
 #ifdef HAVE_7ZIP
@@ -165,6 +180,7 @@ static void core_info_list_free(core_info_list_t *core_info_list)
       free(info->firmware);
    }
 
+   free(core_info_list->all_ext);
    free(core_info_list->list);
    free(core_info_list);
 }
diff --git a/core_info.h b/core_info.h
index 3c77365072..530405c719 100644
--- a/core_info.h
+++ b/core_info.h
@@ -22,7 +22,6 @@
 
 #include <lists/string_list.h>
 #include <retro_common_api.h>
-#include <retro_miscellaneous.h>
 
 RETRO_BEGIN_DECLS
 
@@ -71,7 +70,7 @@ typedef struct
 {
    core_info_t *list;
    size_t count;
-   char all_ext[PATH_MAX_LENGTH];
+   char *all_ext;
 } core_info_list_t;
 
 typedef struct core_info_ctx_firmware