From: john at keeping.me.uk (John Keeping)
Subject: [PATCH 2/3] parsing: clear query path before starting
Date: Sun, 19 Feb 2017 12:45:00 +0000 [thread overview]
Message-ID: <07d9df5c23ad6a54a2c37f6015a030575692719b.1487507852.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1487507852.git.john@keeping.me.uk>
By specifying the "url" query parameter multiple times it is possible to
end up with ctx.qry.vpath set while ctx.repo is null, which triggers an
invalid code path from cgit_print_pageheader() while printing path
crumbs, resulting in a null dereference.
The previous patch fixed this segfault, but it makes no sense for us to
clear ctx.repo while leaving ctx.qry.path set to the previous value, so
let's just clear it here so that the last "url" parameter given takes
full effect rather than partially overriding the effect of the previous
value.
Signed-off-by: John Keeping <john at keeping.me.uk>
---
parsing.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parsing.c b/parsing.c
index 9dacb16..b8d7f10 100644
--- a/parsing.c
+++ b/parsing.c
@@ -21,6 +21,7 @@ void cgit_parse_url(const char *url)
struct cgit_repo *repo;
ctx.repo = NULL;
+ ctx.qry.page = NULL;
if (!url || url[0] == '\0')
return;
@@ -53,7 +54,6 @@ void cgit_parse_url(const char *url)
}
if (cmd[1])
ctx.qry.page = xstrdup(cmd + 1);
- return;
}
}
--
2.12.0.rc2.230.ga28edc07cd
next prev parent reply other threads:[~2017-02-19 12:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-19 12:44 [PATCH 0/3] Fix segfault found by AFL john
2017-02-19 12:44 ` [PATCH 1/3] ui-shared: don't print path crumbs without a repo john
2017-02-19 12:45 ` john [this message]
2017-02-19 12:45 ` [PATCH 3/3] cgit: don't set vpath unless repo is set john
[not found] ` <CAHmME9r8zY9qOqbg7fwuB1gW76nXVcsqJ-LT2-6sjD3SuoJ-HQ@mail.gmail.com>
2017-02-19 19:04 ` [PATCH 0/3] Fix segfault found by AFL Jason
2017-02-20 1:48 ` peter
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=07d9df5c23ad6a54a2c37f6015a030575692719b.1487507852.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).