[PATCH] configfile: fix EOF handling

John Keeping john at keeping.me.uk
Sun Aug 7 17:01:13 CEST 2016

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 <john at keeping.me.uk>
 configfile.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configfile.c b/configfile.c
index 5b0d880..e039109 100644
--- a/configfile.c
+++ b/configfile.c
@@ -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 == ';')
 		else if (!isspace(c))

More information about the CGit mailing list