mirror of
https://github.com/libretro/RetroArch
synced 2025-02-06 09:40:06 +00:00
filestream_getline - be safer
This commit is contained in:
parent
e8ff299fd4
commit
6208981ad3
@ -460,21 +460,27 @@ bool filestream_write_file(const char *path, const void *data, ssize_t size)
|
|||||||
|
|
||||||
char *filestream_getline(RFILE *stream)
|
char *filestream_getline(RFILE *stream)
|
||||||
{
|
{
|
||||||
char* newline = (char*)malloc(9);
|
char* newline_tmp = NULL;
|
||||||
char* newline_tmp = NULL;
|
size_t cur_size = 8;
|
||||||
size_t cur_size = 8;
|
size_t idx = 0;
|
||||||
size_t idx = 0;
|
int in = 0;
|
||||||
int in = filestream_getc(stream);
|
char* newline = (char*)malloc(9);
|
||||||
|
|
||||||
if (!newline)
|
if (!stream || !newline)
|
||||||
|
{
|
||||||
|
if (newline)
|
||||||
|
free(newline);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
in = filestream_getc(stream);
|
||||||
|
|
||||||
while (in != EOF && in != '\n')
|
while (in != EOF && in != '\n')
|
||||||
{
|
{
|
||||||
if (idx == cur_size)
|
if (idx == cur_size)
|
||||||
{
|
{
|
||||||
cur_size *= 2;
|
cur_size *= 2;
|
||||||
newline_tmp = (char*)realloc(newline, cur_size + 1);
|
newline_tmp = (char*)realloc(newline, cur_size + 1);
|
||||||
|
|
||||||
if (!newline_tmp)
|
if (!newline_tmp)
|
||||||
{
|
{
|
||||||
@ -482,13 +488,13 @@ char *filestream_getline(RFILE *stream)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
newline = newline_tmp;
|
newline = newline_tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
newline[idx++] = in;
|
newline[idx++] = in;
|
||||||
in = filestream_getc(stream);
|
in = filestream_getc(stream);
|
||||||
}
|
}
|
||||||
|
|
||||||
newline[idx] = '\0';
|
newline[idx] = '\0';
|
||||||
return newline;
|
return newline;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user