Skip to content

Commit

Permalink
configfile: fix EOF handling
Browse files Browse the repository at this point in the history
Currently we can end up passing EOF to isspace(), which is in fact
libgit's sane_isspace which does:

	((sane_ctype[(unsigned char)(x)] & (GIT_SPACE)) != 0)

It is very unlikely that EOF cast to "unsigned char" will end up in a
character that has the GIT_SPACE bit set, but the standard only requires
that EOF be a negative integer, so it could access any value in the
sane_ctype array.

If it does end up returning true for isspace() then this loop will never
terminate, so handle EOF as a special value in the same way as the other
loops in this function.

Signed-off-by: John Keeping <[email protected]>
  • Loading branch information
johnkeeping committed Oct 1, 2016
1 parent 11695a5 commit 35df710
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion configfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ static int read_config_line(FILE *f, struct strbuf *name, struct strbuf *value)

/* Skip comments and preceding spaces. */
for(;;) {
if (c == '#' || c == ';')
if (c == EOF)
return 0;
else if (c == '#' || c == ';')
skip_line(f);
else if (!isspace(c))
break;
Expand Down

0 comments on commit 35df710

Please sign in to comment.