ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix file_stream_transforms:rfscanf() (#13023)

This commit is contained in:
jdgleaver 2021-09-21 16:04:34 +01:00 committed by GitHub
parent b87bc46064
commit 6c5e17e5ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretro-common/include/streams/file_stream.h
View File

@ -81,7 +81,7 @@ char* filestream_gets(RFILE *stream, char *s, size_t len);
int filestream_getc(RFILE *stream); int filestream_getc(RFILE *stream);
int filestream_scanf(RFILE *stream, const char* format, ...); int filestream_vscanf(RFILE *stream, const char* format, va_list *args);
int filestream_eof(RFILE *stream); int filestream_eof(RFILE *stream);

15
libretro-common/streams/file_stream.c
View File

@ -221,11 +221,11 @@ int filestream_getc(RFILE *stream)
return EOF; return EOF;
} }
int filestream_scanf(RFILE *stream, const char* format, ...) int filestream_vscanf(RFILE *stream, const char* format, va_list *args)
{ {
char buf[4096]; char buf[4096];
char subfmt[64]; char subfmt[64];
va_list args; va_list args_copy;
const char * bufiter = buf; const char * bufiter = buf;
int ret = 0; int ret = 0;
int64_t startpos = filestream_tell(stream); int64_t startpos = filestream_tell(stream);
@ -236,7 +236,12 @@ int filestream_scanf(RFILE *stream, const char* format, ...)
buf[maxlen] = '\0'; buf[maxlen] = '\0';
va_start(args, format); /* Have to copy the input va_list here
* > Calling va_arg() on 'args' directly would
* cause the va_list to have an indeterminate value
* in the function calling filestream_vscanf(),
* leading to unexpected behaviour */
va_copy(args_copy, *args);
while (*format) while (*format)
{ {
@ -302,7 +307,7 @@ int filestream_scanf(RFILE *stream, const char* format, ...)
} }
else else
{ {
int v = sscanf(bufiter, subfmt, va_arg(args, void*), &sublen); int v = sscanf(bufiter, subfmt, va_arg(args_copy, void*), &sublen);
if (v == EOF) if (v == EOF)
return EOF; return EOF;
if (v != 1) if (v != 1)
@ -327,7 +332,7 @@ int filestream_scanf(RFILE *stream, const char* format, ...)
} }
} }
va_end(args); va_end(args_copy);
filestream_seek(stream, startpos+(bufiter-buf), filestream_seek(stream, startpos+(bufiter-buf),
RETRO_VFS_SEEK_POSITION_START); RETRO_VFS_SEEK_POSITION_START);

2
libretro-common/streams/file_stream_transforms.c
View File

@ -153,7 +153,7 @@ int rfscanf(RFILE * stream, const char * format, ...)
int result; int result;
va_list vl; va_list vl;
va_start(vl, format); va_start(vl, format);
result = filestream_scanf(stream, format, vl); result = filestream_vscanf(stream, format, &vl);
va_end(vl); va_end(vl);
return result; return result;
} }