thirdparty/retroarch
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Don't do NULL termination on strings when passing to strlcpy and/or

Browse source 
a file_path function that calls strlcpy under the hood
This commit is contained in:
libretroadmin 2022-07-26 07:01:10 +02:00
parent d5becf92e8
commit 8ac1a36259
7 changed files with 19 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tasks/task_database.c
View file

@ -261,9 +261,7 @@ static int task_database_cue_get_serial(const char *name, char* serial)
track_path[0] = '\0';
rv = cue_find_track(name, true, &offset, &size, track_path, sizeof(track_path));
if (rv < 0)
if ((rv = cue_find_track(name, true, &offset, &size, track_path, sizeof(track_path))) < 0)
{
#ifdef DEBUG
RARCH_LOG("%s: %s\n",
@ -287,9 +285,8 @@ static int task_database_gdi_get_serial(const char *name, char* serial)
track_path[0] = '\0';
rv = gdi_find_track(name, true, track_path, sizeof(track_path));
if (rv < 0)
if ((rv = gdi_find_track(name, true,
track_path, sizeof(track_path))) < 0)
{
#ifdef DEBUG
RARCH_LOG("%s: %s\n",
@ -391,10 +388,8 @@ static int task_database_cue_get_crc(const char *name, uint32_t *crc)
track_path[0] = '\0';
rv = cue_find_track(name, false, &offset, &size,
track_path, sizeof(track_path));
if (rv < 0)
if ((rv = cue_find_track(name, false, &offset, &size,
track_path, sizeof(track_path))) < 0)
{
#ifdef DEBUG
RARCH_LOG("%s: %s\n",
@ -424,9 +419,8 @@ static int task_database_gdi_get_crc(const char *name, uint32_t *crc)
track_path[0] = '\0';
rv = gdi_find_track(name, true, track_path, sizeof(track_path));
if (rv < 0)
if ((rv = gdi_find_track(name, true,
track_path, sizeof(track_path))) < 0)
{
#ifdef DEBUG
RARCH_LOG("%s: %s\n", msg_hash_to_str(MSG_COULD_NOT_FIND_VALID_DATA_TRACK),
@ -749,7 +743,6 @@ static int database_info_list_iterate_found_match(
db_crc[0] = '\0';
db_playlist_path[0] = '\0';
db_playlist_base_str[0] = '\0';
entry_path_str[0] = '\0';
fill_pathname(db_playlist_base_str,
@ -771,9 +764,7 @@ static int database_info_list_iterate_found_match(
RARCH_ERR("Serial string encoding error\n");
}
else
{
snprintf(db_crc, str_len, "%08lX|crc", (unsigned long)db_info_entry->crc32);
}
if (entry_path)
strlcpy(entry_path_str, entry_path, str_len);
@ -1005,9 +996,6 @@ static int task_database_iterate_playlist_lutro(
{
struct playlist_entry entry;
char game_title[PATH_MAX_LENGTH];
game_title[0] = '\0';
fill_pathname(game_title,
path_basename(path), "", sizeof(game_title));
path_remove_extension(game_title);