IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

io: fix handling EOF in vim_fgets

Browse Source 
If an EOF is returned from `fgets`, `vim_fgets` might spin forever, as
it tries to consume the current line.

A `NULL` return value from `fgets` should break out of the function
(unless `errno` is `EINTR`), and then `feof` should be used to check for
the EOF condition on the stream.
This commit is contained in:
Matt Widmann 2017-11-25 13:27:59 -08:00
parent 0f9c90e0ed
commit bab2f8200a
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/nvim/fileio.c
View File

@ -4443,27 +4443,32 @@ char *modname(const char *fname, const char *ext, bool prepend_dot)
/// @return true for end-of-file.
bool vim_fgets(char_u *buf, int size, FILE *fp) FUNC_ATTR_NONNULL_ALL
{
char *eof;
#define FGETS_SIZE 200
char tbuf[FGETS_SIZE];
char *retval;
assert(size > 0);
buf[size - 2] = NUL;
retry:
errno = 0;
eof = fgets((char *)buf, size, fp);
if (eof == NULL && errno == EINTR) {
goto retry;
}
if (buf[size - 2] != NUL && buf[size - 2] != '\n') {
buf[size - 1] = NUL; /* Truncate the line */
/* Now throw away the rest of the line: */
do {
errno = 0;
retval = fgets((char *)buf, size, fp);
} while (retval == NULL && errno == EINTR);
if (buf[size - 2] != NUL && buf[size - 2] != '\n') {
char tbuf[200];
buf[size - 1] = NUL; // Truncate the line.
// Now throw away the rest of the line:
do {
tbuf[FGETS_SIZE - 2] = NUL;
ignoredp = fgets((char *)tbuf, FGETS_SIZE, fp);
} while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
tbuf[sizeof(tbuf) - 2] = NUL;
errno = 0;
retval = fgets((char *)tbuf, sizeof(tbuf), fp);
if (retval == NULL && errno != EINTR) {
break;
}
} while (tbuf[sizeof(tbuf) - 2] != NUL && tbuf[sizeof(tbuf) - 2] != '\n');
}
return eof == NULL;
return retval ? false : feof(fp);
}
/// Read 2 bytes from "fd" and turn them into an int, MSB first.