crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix section-from-path > 1

Browse Source 
When having found the first path separator occurrence at position i, we
invoked strchr() on the same position i in subsequent iterations
resulting in the same path separator being returned by strchr() over and
over again. Increase the position by one to skip the occurrence that has
just been found and advance to the next separator.

Reported-by: Konstantin Ryabitsev <mricon@kernel.org>
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2013-06-28 08:58:14 +00:00 committed by Jason A. Donenfeld
parent 1a194aa2c7
commit 86e309fcb5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scan-tree.c
View File

@ -150,12 +150,12 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
if (ctx.cfg.section_from_path) { if (ctx.cfg.section_from_path) {
n = ctx.cfg.section_from_path; n = ctx.cfg.section_from_path;
if (n > 0) { if (n > 0) {
slash = rel.buf; slash = rel.buf - 1;
while (slash && n && (slash = strchr(slash, '/'))) while (slash && n && (slash = strchr(slash + 1, '/')))
n--; n--;
} else { } else {
slash = rel.buf + rel.len; slash = rel.buf + rel.len;
while (slash && n && (slash = xstrrchr(rel.buf, slash, '/'))) while (slash && n && (slash = xstrrchr(rel.buf, slash - 1, '/')))
n++; n++;
} }
if (slash && !n) { if (slash && !n) {