From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 12 Dec 2006 15:22:26 +0000 (+0000)
Subject: Possible fix of two bugs (1) bug #759: Crash during retrieval of some
X-Git-Tag: ZEBRA.2.0.8~32
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=bc188023090ef327b214032d0b2ae4dd8dfddcde;p=idzebra-moved-to-github.git

Possible fix of two bugs (1) bug #759: Crash during retrieval of some
records (2) bug #765.
---

diff --git a/util/charmap.c b/util/charmap.c
index 374c35f..8688a7f 100644
--- a/util/charmap.c
+++ b/util/charmap.c
@@ -1,4 +1,4 @@
-/* $Id: charmap.c,v 1.42 2006-09-21 20:22:35 adam Exp $
+/* $Id: charmap.c,v 1.43 2006-12-12 15:22:26 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -238,8 +238,11 @@ const char **chr_map_q_input(chrmaptab maptab,
 const char *chr_map_output(chrmaptab maptab, const char **from, int len)
 {
     unsigned char c = ** (unsigned char **) from;
-    (*from)++;
-    return (const char*) maptab->output[c];
+    const char *out = (const char*) maptab->output[c];
+
+    if (out)
+        (*from)++;
+    return out;
 }
 
 static int zebra_ucs4_strlen(ucs4_t *s)