From cd36af1d249fdb5c7acca43e196859fadf601e07 Mon Sep 17 00:00:00 2001
From: libretroadmin <reallibretroretroarch@gmail.com>
Date: Sun, 3 Jul 2022 13:59:23 +0200
Subject: [PATCH] Use NAME_MAX_LENGTH for some char array variables that have a
 fixed width of 256

---
 core_info.c            | 8 ++++----
 runloop.h              | 2 +-
 tasks/task_content.c   | 2 +-
 tasks/tasks_internal.h | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core_info.c b/core_info.c
index 57c15aafa8..d0729097c9 100644
--- a/core_info.c
+++ b/core_info.c
@@ -1486,7 +1486,7 @@ static bool core_info_path_is_locked(
 {
    size_t i;
    uint32_t hash;
-   char lock_filename[256];
+   char lock_filename[NAME_MAX_LENGTH];
 
    lock_filename[0] = '\0';
 
@@ -1516,7 +1516,7 @@ static bool core_info_path_is_standalone_exempt(
 {
    size_t i;
    uint32_t hash;
-   char exempt_filename[256];
+   char exempt_filename[NAME_MAX_LENGTH];
 
    exempt_filename[0] = '\0';
 
@@ -1570,9 +1570,9 @@ static core_info_t *core_info_find_internal(
       core_info_list_t *list,
       const char *core_path)
 {
-   char core_file_id[256];
-   uint32_t hash;
    size_t i;
+   uint32_t hash;
+   char core_file_id[256];
 
    core_file_id[0] = '\0';
 
diff --git a/runloop.h b/runloop.h
index c5c088a72e..41792ce33a 100644
--- a/runloop.h
+++ b/runloop.h
@@ -233,7 +233,7 @@ struct runloop
 #endif
 
    char runtime_content_path_basename[8192];
-   char current_library_name[256];
+   char current_library_name[NAME_MAX_LENGTH];
    char current_library_version[256];
    char current_valid_extensions[256];
    char subsystem_path[256];
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 5d3ec23fbf..6434822ea0 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -562,7 +562,7 @@ static bool content_file_list_set_info(
       const char *archive_delim = NULL;
       const char *ext           = NULL;
       char dir[PATH_MAX_LENGTH];
-      char name[256];
+      char name[NAME_MAX_LENGTH];
 
       dir[0]  = '\0';
       name[0] = '\0';
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index d63d6e15f3..305dc94caa 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -230,7 +230,7 @@ struct screenshot_task_state
    unsigned pixel_format_type;
 
    char filename[PATH_MAX_LENGTH];
-   char shotname[256];
+   char shotname[NAME_MAX_LENGTH];
 
    bool bgr24;
    bool silence;