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

diff --git a/src/odr_oct.c b/src/odr_oct.c
index b21125a..c5cc823 100644
--- a/src/odr_oct.c
+++ b/src/odr_oct.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_oct.c,v 1.11 2007-03-19 21:08:13 adam Exp $
  */
 /**
  * \file odr_oct.c
@@ -146,8 +144,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);
@@ -190,6 +196,13 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
                 odr_seterror(o, ODATA, 45);
                 return 0;
             }
+            ret = yaz_iconv(o->op->iconv_handle, 0, 0,
+                            &outbuf, &outleft);
+            if (ret == (size_t)(-1))
+            {
+                odr_seterror(o, ODATA, 45);
+                return 0;
+            }
             inleft = outbuf - (char*) *p;
             
             (*p)[inleft] = '\0';    /* null terminate it */
@@ -205,6 +218,7 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab