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

file_stream_transforms.c: Ensure correct return values + fix segfault when calling rfread() with zero elem_size (#13279)

Browse Source
This commit is contained in:
jdgleaver 2021-11-24 10:32:42 +00:00 committed by GitHub
parent 1077a6f3a8
commit 3c4b39057f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,17 +69,27 @@ RFILE* rfopen(const char *path, const char *mode)
int rfclose(RFILE* stream) int rfclose(RFILE* stream)
{ {
if (!stream)
return EOF;
return filestream_close(stream); return filestream_close(stream);
} }
int64_t rftell(RFILE* stream) int64_t rftell(RFILE* stream)
{ {
if (!stream)
return -1;
return filestream_tell(stream); return filestream_tell(stream);
} }
int64_t rfseek(RFILE* stream, int64_t offset, int origin) int64_t rfseek(RFILE* stream, int64_t offset, int origin)
{ {
int seek_position = -1; int seek_position = -1;
if (!stream)
return -1;
switch (origin) switch (origin)
{ {
case SEEK_SET: case SEEK_SET:
@ -99,39 +109,61 @@ int64_t rfseek(RFILE* stream, int64_t offset, int origin)
int64_t rfread(void* buffer, int64_t rfread(void* buffer,
size_t elem_size, size_t elem_count, RFILE* stream) size_t elem_size, size_t elem_count, RFILE* stream)
{ {
if (!stream || (elem_size == 0) || (elem_count == 0))
return 0;
return (filestream_read(stream, buffer, elem_size * elem_count) / elem_size); return (filestream_read(stream, buffer, elem_size * elem_count) / elem_size);
} }
char *rfgets(char *buffer, int maxCount, RFILE* stream) char *rfgets(char *buffer, int maxCount, RFILE* stream)
{ {
if (!stream)
return NULL;
return filestream_gets(stream, buffer, maxCount); return filestream_gets(stream, buffer, maxCount);
} }
int rfgetc(RFILE* stream) int rfgetc(RFILE* stream)
{ {
if (!stream)
return EOF;
return filestream_getc(stream); return filestream_getc(stream);
} }
int64_t rfwrite(void const* buffer, int64_t rfwrite(void const* buffer,
size_t elem_size, size_t elem_count, RFILE* stream) size_t elem_size, size_t elem_count, RFILE* stream)
{ {
return filestream_write(stream, buffer, elem_size * elem_count); if (!stream || (elem_size == 0) || (elem_count == 0))
return 0;
return (filestream_write(stream, buffer, elem_size * elem_count) / elem_size);
} }
int rfputc(int character, RFILE * stream) int rfputc(int character, RFILE * stream)
{ {
return filestream_putc(stream, character); if (!stream)
return EOF;
return filestream_putc(stream, character);
} }
int64_t rfflush(RFILE * stream) int64_t rfflush(RFILE * stream)
{ {
return filestream_flush(stream); if (!stream)
return EOF;
return filestream_flush(stream);
} }
int rfprintf(RFILE * stream, const char * format, ...) int rfprintf(RFILE * stream, const char * format, ...)
{ {
int result; int result;
va_list vl; va_list vl;
if (!stream)
return -1;
va_start(vl, format); va_start(vl, format);
result = filestream_vprintf(stream, format, vl); result = filestream_vprintf(stream, format, vl);
va_end(vl); va_end(vl);
@ -152,6 +184,10 @@ int rfscanf(RFILE * stream, const char * format, ...)
{ {
int result; int result;
va_list vl; va_list vl;
if (!stream)
return 0;
va_start(vl, format); va_start(vl, format);
result = filestream_vscanf(stream, format, &vl); result = filestream_vscanf(stream, format, &vl);
va_end(vl); va_end(vl);