After incrementing an unsigned char value, don't cast it back to

[sgt/agedu] / trie.c

diff --git a/trie.c b/trie.c
index 345756f..48302db 100644 (file)
--- a/trie.c
+++ b/trie.c
@@ -15,9 +15,9 @@
  */
 static int trieccmp(unsigned char a, unsigned char b)
 {
-    a = (a == '\0' ? '\0' : a == pathsep ? '\1' : a+1);
-    b = (b == '\0' ? '\0' : b == pathsep ? '\1' : b+1);
-    return (int)a - (int)b;
+    int ia = (a == '\0' ? '\0' : a == pathsep ? '\1' : a+1);
+    int ib = (b == '\0' ? '\0' : b == pathsep ? '\1' : b+1);
+    return ia - ib;
 }
 
 static int triencmp(const char *a, size_t alen,
@@ -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) {
            /*