aboutsummaryrefslogtreecommitdiffstats
path: root/scan-tree.c
diff options
context:
space:
mode:
authorLukas Fleischer <cgit@cryptocrack.de>2013-06-28 08:58:14 +0000
committerJason A. Donenfeld <Jason@zx2c4.com>2013-08-12 13:14:11 -0600
commit86e309fcb5ba64d29821b1e40407a4007e34df75 (patch)
tree16a7a9bee74cefb9916dbe229f492dc23cf28f3d /scan-tree.c
parentMakefile: Change default prefix to "/usr/local" (diff)
downloadcgit-86e309fcb5ba64d29821b1e40407a4007e34df75.tar.xz
cgit-86e309fcb5ba64d29821b1e40407a4007e34df75.zip
Fix section-from-path > 1
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>
Diffstat (limited to '')
-rw-r--r--scan-tree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/scan-tree.c b/scan-tree.c
index 2684b44..7cd8f08 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -148,14 +148,14 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
}
if (ctx.cfg.section_from_path) {
- n = ctx.cfg.section_from_path;
+ n = ctx.cfg.section_from_path;
if (n > 0) {
- slash = rel.buf;
- while (slash && n && (slash = strchr(slash, '/')))
+ slash = rel.buf - 1;
+ while (slash && n && (slash = strchr(slash + 1, '/')))
n--;
} else {
slash = rel.buf + rel.len;
- while (slash && n && (slash = xstrrchr(rel.buf, slash, '/')))
+ while (slash && n && (slash = xstrrchr(rel.buf, slash - 1, '/')))
n++;
}
if (slash && !n) {