From 5892277cd04bb9ed0dee5bea5fdf96f95aac0a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Tue, 31 May 2011 15:16:25 +0200 Subject: [PATCH] Config parse header ext: don't allow text after closing quote MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Nothing is allowed betwen the closing quotation mark and the ] so return an error if there is. Signed-off-by: Carlos Martín Nieto --- src/config_file.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/config_file.c b/src/config_file.c index 4b7ce069e..57611a762 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -595,12 +595,15 @@ static int parse_section_header_ext(const char *line, const char *base_name, cha * added to the string. In case of error, jump to out */ do { + if (quote_marks == 2) { + error = git__throw(GIT_EOBJCORRUPTED, "Falied to parse ext header. Text after closing quote"); + goto out; + + } + switch (c) { case '"': - if (quote_marks++ >= 2) { - error = git__throw(GIT_EOBJCORRUPTED, "Failed to parse ext header. Too many quotes"); - goto out; - } + ++quote_marks; break; case '\\': c = line[rpos++]; @@ -612,6 +615,7 @@ static int parse_section_header_ext(const char *line, const char *base_name, cha error = git__throw(GIT_EOBJCORRUPTED, "Failed to parse ext header. Unsupported escape char \\%c", c); goto out; } + break; default: break; }