From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Tue, 25 Nov 2008 18:08:17 +0000 (+0000)
Subject: Fix a segfault in the case where the entire recursive scan covers
X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/agedu/commitdiff_plain/cf39b58867b4e3ecc99af144820873b145946e86

Fix a segfault in the case where the entire recursive scan covers
only one filename.


git-svn-id: svn://svn.tartarus.org/sgt/agedu@8328 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/trie.c b/trie.c
index 345756f..ddadddb 100644
--- a/trie.c
+++ b/trie.c
@@ -218,7 +218,8 @@ static off_t triebuild_unwind(triebuild *tb, int targetdepth, int *outcount)
     while (depth > targetdepth) {
 	int odepth = depth;
 	while (depth > targetdepth &&
-	       (depth-1 > tb->switchsize || tb->switches[depth-1].len == 0))
+	       (depth-1 > tb->switchsize || !tb->switches ||
+		tb->switches[depth-1].len == 0))
 	    depth--;
 	if (odepth > depth) {
 	    /*