X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fzebramap.c;h=f462ef9dfab91fa23b323fb923406f4927860140;hb=658e913f7bdebe46f428d58914951ed19d193e2f;hp=c833799ff36f62e65f59421c4dc4bada5273acf7;hpb=e86905c6c3e2ef3d05ab57c4662acddfcc265c15;p=idzebra-moved-to-github.git

diff --git a/util/zebramap.c b/util/zebramap.c
index c833799..f462ef9 100644
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,4 +1,4 @@
-/* $Id: zebramap.c,v 1.76 2007-12-20 19:02:12 adam Exp $
+/* $Id: zebramap.c,v 1.78 2008-01-24 16:13:12 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -716,12 +716,13 @@ int zebra_map_tokenize_start(zebra_map_t zm,
         icu_chain_assign_cstr(zm->icu_chain,
                               wrbuf_cstr(zm->input_str),
                               &status);
-        if (zm->debug)
+        if (!U_SUCCESS(status))
         {
-            if (!U_SUCCESS(status))
+            if (zm->debug)
             {
                 yaz_log(YLOG_WARN, "bad encoding for input");
             }
+            return -1;
         }
     }
 #endif
@@ -730,6 +731,7 @@ int zebra_map_tokenize_start(zebra_map_t zm,
 
 int zebra_maps_is_icu(zebra_map_t zm)
 {
+    assert(zm);
 #if YAZ_HAVE_ICU
     return zm->use_chain;
 #else