X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcharconv.tcl;h=d57f2262d7bdab6764c8a7d96ce90194d0979fc4;hb=c6b8edd2312a4606cc014738266059a20e3b6e61;hp=f09b82ebbe0e9707a0423d261f6945049ef270aa;hpb=1fb26db29805d4822763c205358f394725b0f02c;p=yaz-moved-to-github.git

diff --git a/src/charconv.tcl b/src/charconv.tcl
index f09b82e..d57f226 100644
--- a/src/charconv.tcl
+++ b/src/charconv.tcl
@@ -37,19 +37,22 @@ proc preamble_trie {ofilehandle ifiles ofile} {
         static unsigned long lookup(struct yaz_iconv_trie **ptrs, int ptr, unsigned char *inp,
                                     size_t inbytesleft, size_t *no_read, int *combining, unsigned mask, int boffset)
         {
-            struct yaz_iconv_trie *t = (ptr > 0) ? ptrs[ptr-1] : 0;
-            if (!t || inbytesleft < 1)
+            struct yaz_iconv_trie *t = ptrs[ptr-1];
+            if (inbytesleft < 1)
                 return 0;
             if (t->dir)
             {
                 size_t ch = (inp[0] & mask) + boffset;
-                unsigned long code =
-                lookup(ptrs, t->dir[ch].ptr, inp+1, inbytesleft-1, no_read, combining, mask, boffset);
-                if (code)
+                unsigned long code;
+                if (t->dir[ch].ptr)
                 {
-                    (*no_read)++;
-                    return code;
-                }
+                    code = lookup(ptrs, t->dir[ch].ptr, inp+1, inbytesleft-1, no_read, combining, mask, boffset);
+		    if (code)
+		    {
+			(*no_read)++;
+			return code;
+		    }
+		}
                 if (t->dir[ch].to)
                 {
                     code = t->dir[ch].to;