X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fodr_oct.c;h=c4ef1680ba9a761515b353b03a1a2a8755c28c7e;hb=fe507b6b15788a3a8e58063d9dae52532a5229a5;hp=b21125a368be68c9d955a6afd6884c87abc108e3;hpb=db93359f0cbf9a1e9dc81ea05f7b8662f843ae3d;p=yaz-moved-to-github.git

diff --git a/src/odr_oct.c b/src/odr_oct.c
index b21125a..c4ef168 100644
--- a/src/odr_oct.c
+++ b/src/odr_oct.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: odr_oct.c,v 1.11 2007-03-19 21:08:13 adam Exp $
+ * $Id: odr_oct.c,v 1.12 2007-05-02 11:31:59 adam Exp $
  */
 /**
  * \file odr_oct.c
@@ -146,8 +146,16 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
             
             t->buf = (unsigned char *) outbuf;
             
-            ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
-                             &outbuf, &outleft);
+            ret = yaz_iconv(o->op->iconv_handle, &inbuf, &inleft,
+                            &outbuf, &outleft);
+            if (ret == (size_t)(-1))
+            {
+                odr_seterror(o, ODATA, 44);
+                return 0;
+            }
+            ret = yaz_iconv(o->op->iconv_handle, 0, 0,
+                            &outbuf, &outleft);
+
             if (ret == (size_t)(-1))
             {
                 odr_seterror(o, ODATA, 44);