mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 04:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10385 from jdgleaver/playlist-strlen-fix

Browse Source 
(playlist.c) Prevent possible NULL pointer dereferences when calling strlen()
This commit is contained in:
Autechre 2020-04-02 16:05:17 +02:00 committed by GitHub
commit dea5b5347d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
playlist.c
View File

@ -1114,8 +1114,14 @@ void playlist_write_runtime_file(playlist_t *playlist)
STRLEN_CONST("core_path"), JSON_UTF8);
JSON_Writer_WriteColon(context.writer);
JSON_Writer_WriteSpace(context.writer, 1);
JSON_Writer_WriteString(context.writer, playlist->entries[i].core_path,
strlen(playlist->entries[i].core_path), JSON_UTF8);
JSON_Writer_WriteString(context.writer,
playlist->entries[i].core_path
? playlist->entries[i].core_path
: "",
playlist->entries[i].core_path
? strlen(playlist->entries[i].core_path)
: 0,
JSON_UTF8);
JSON_Writer_WriteComma(context.writer);
JSON_Writer_WriteNewLine(context.writer);
@ -1461,8 +1467,13 @@ void playlist_write_file(playlist_t *playlist, bool use_old_format)
JSON_Writer_WriteColon(context.writer);
JSON_Writer_WriteSpace(context.writer, 1);
JSON_Writer_WriteString(context.writer,
playlist->entries[i].core_path,
strlen(playlist->entries[i].core_path), JSON_UTF8);
playlist->entries[i].core_path
? playlist->entries[i].core_path
: "",
playlist->entries[i].core_path
? strlen(playlist->entries[i].core_path)
: 0,
JSON_UTF8);
JSON_Writer_WriteComma(context.writer);
JSON_Writer_WriteNewLine(context.writer);
@ -1472,8 +1483,13 @@ void playlist_write_file(playlist_t *playlist, bool use_old_format)
JSON_Writer_WriteColon(context.writer);
JSON_Writer_WriteSpace(context.writer, 1);
JSON_Writer_WriteString(context.writer,
playlist->entries[i].core_name,
strlen(playlist->entries[i].core_name), JSON_UTF8);
playlist->entries[i].core_name
? playlist->entries[i].core_name
: "",
playlist->entries[i].core_name
? strlen(playlist->entries[i].core_name)
: 0,
JSON_UTF8);
JSON_Writer_WriteComma(context.writer);
JSON_Writer_WriteNewLine(context.writer);