List for cgit developers and users
 help / color / mirror / Atom feed
From: john at keeping.me.uk (John Keeping)
Subject: [PATCH] configfile: fix EOF handling
Date: Sun,  7 Aug 2016 16:01:13 +0100	[thread overview]
Message-ID: <d09340b9d40ddb6cccb5da051002a84bff3fc0f4.1470582005.git.john@keeping.me.uk> (raw)

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 == ';')
 			skip_line(f);
 		else if (!isspace(c))
 			break;
-- 
2.9.2.639.g855ae9f



                 reply	other threads:[~2016-08-07 15:01 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d09340b9d40ddb6cccb5da051002a84bff3fc0f4.1470582005.git.john@keeping.me.uk \
    --to=cgit@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).