mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 13:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible bug in tok_fgets() processing an empty line.

Browse Source
This commit is contained in:
David Capello 2010-10-26 13:51:15 -07:00
parent e7db41ab66
commit 6a48cdcaa2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/filetoks.cpp
View File

@ -109,14 +109,16 @@ char* tok_read(FILE* f, char* buf, char* leavings, int sizeof_leavings)
/* returns the readed line or NULL if EOF (the line will not have the
"\n" character) */
static char *tok_fgets (char *buf, int size, FILE *file)
static char* tok_fgets(char* buf, int size, FILE* file)
{
char *s, *ret = fgets (buf, size, file);
char* ret = fgets(buf, size, file);
if (ret && *ret) {
s = ret + strlen (ret) - 1;
while (*s && (*s == '\n' || *s == '\r'))
// Remove trailing \r\n
char* s = ret + strlen(ret);
do {
*(s--) = 0;
} while (s >= ret && *s && (*s == '\n' || *s == '\r'));
}
return ret;