ZOOM: throw present request out of range again YAZ-739

[yaz-moved-to-github.git] / src / odr_oct.c

diff --git a/src/odr_oct.c b/src/odr_oct.c
index 0832643..d9c35a8 100644 (file)
--- a/src/odr_oct.c
+++ b/src/odr_oct.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_oct.c,v 1.9 2005-06-25 15:46:04 adam Exp $
  */
 /**
  * \file odr_oct.c
@@ -24,12 +22,13 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
 
     if (o->error)
         return 0;
-    if (o->t_class < 0)
+    if (o->op->t_class < 0)
     {
-        o->t_class = ODR_UNIVERSAL;
-        o->t_tag = ODR_OCTETSTRING;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_OCTETSTRING;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
+    res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+    if (res < 0)
         return 0;
     if (!res)
         return odr_missing(o, opt, name);
@@ -38,7 +37,7 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
         odr_prname(o, name);
         odr_printf(o, "OCTETSTRING(len=%d) ", (*p)->len);
 
-        o->op->stream_write(o, o->print, ODR_OCTETSTRING,
+        o->op->stream_write(o, o->op->print, ODR_OCTETSTRING,
                             (char*) (*p)->buf, (*p)->len);
         odr_printf(o, "\n");
         return 1;
@@ -46,7 +45,6 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
     if (o->direction == ODR_DECODE)
     {
         *p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
-        (*p)->size= 0;
         (*p)->len = 0;
         (*p)->buf = 0;
     }
@@ -66,12 +64,13 @@ int odr_cstring(ODR o, char **p, int opt, const char *name)
 
     if (o->error)
         return 0;
-    if (o->t_class < 0)
+    if (o->op->t_class < 0)
     {
-        o->t_class = ODR_UNIVERSAL;
-        o->t_tag = ODR_OCTETSTRING;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_OCTETSTRING;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
+    res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+    if (res < 0)
         return 0;
     if (!res)
         return odr_missing(o, opt, name);
@@ -84,12 +83,11 @@ int odr_cstring(ODR o, char **p, int opt, const char *name)
     t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
     if (o->direction == ODR_ENCODE)
     {
-        t->buf = (unsigned char *) *p;
-        t->size = t->len = strlen(*p);
+        t->buf = *p;
+        t->len = strlen(*p);
     }
     else
     {
-        t->size= 0;
         t->len = 0;
         t->buf = 0;
     }
@@ -113,12 +111,13 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
 
     if (o->error)
         return 0;
-    if (o->t_class < 0)
+    if (o->op->t_class < 0)
     {
-        o->t_class = ODR_UNIVERSAL;
-        o->t_tag = ODR_OCTETSTRING;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_OCTETSTRING;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
+    res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+    if (res < 0)
         return 0;
     if (!res)
         return odr_missing(o, opt, name);
@@ -140,27 +139,34 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
             size_t outleft = 4 * inleft + 2;
             char *outbuf = (char *) odr_malloc (o, outleft);
             size_t ret;
-            
-            t->buf = (unsigned char *) outbuf;
-            
-            ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
-                             &outbuf, &outleft);
+
+            t->buf = outbuf;
+
+            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);
                 return 0;
             }
-            t->size = t->len = outbuf - (char*) t->buf;
+            t->len = outbuf - (char*) t->buf;
         }
         if (!t->buf)
         {
-            t->buf = (unsigned char *) *p;
-            t->size = t->len = strlen(*p);
+            t->buf = *p;
+            t->len = strlen(*p);
         }
     }
     else
     {
-        t->size= 0;
         t->len = 0;
         t->buf = 0;
     }
@@ -179,7 +185,7 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
             size_t ret;
 
             *p = outbuf;
-            
+
             ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
                              &outbuf, &outleft);
             if (ret == (size_t)(-1))
@@ -187,8 +193,15 @@ 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 */
         }
         if (!*p)
@@ -202,6 +215,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