2007.

[idzebra-moved-to-github.git] / util / charmap.c

diff --git a/util/charmap.c b/util/charmap.c
index 093681e..1913a5f 100644 (file)
--- a/util/charmap.c
+++ b/util/charmap.c
@@ -1,5 +1,5 @@
-/* $Id: charmap.c,v 1.41 2006-08-14 10:40:34 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: charmap.c,v 1.44 2007-01-15 15:10:26 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -46,7 +46,7 @@ const unsigned char CHR_FIELD_BEGIN = '^';
 const char *CHR_UNKNOWN = "\001";
 const char *CHR_SPACE   = "\002";
 const char *CHR_CUT     = "\003";
-const char *CHR_BASE    = "\005";
+const char *CHR_BASE    = "\005"; /* CHECK CHR_BASE_CHAR as well */
 
 struct chrmaptab_info
 {
@@ -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)