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 1ea7353..d9c35a8 100644 (file)
--- a/src/odr_oct.c
+++ b/src/odr_oct.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (c) 1995-2004, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_oct.c,v 1.7 2004-11-18 15:18:13 heikki Exp $
  */
 /**
  * \file odr_oct.c
@@ -23,35 +21,35 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
     int res, cons = 0;
 
     if (o->error)
-       return 0;
-    if (o->t_class < 0)
+        return 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)
-       return 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);
+        return odr_missing(o, opt, name);
     if (o->direction == ODR_PRINT)
     {
-       odr_prname(o, name);
-       odr_printf(o, "OCTETSTRING(len=%d) ", (*p)->len);
+        odr_prname(o, name);
+        odr_printf(o, "OCTETSTRING(len=%d) ", (*p)->len);
 
-       o->op->stream_write(o, o->print, ODR_OCTETSTRING,
-                           (char*) (*p)->buf, (*p)->len);
+        o->op->stream_write(o, o->op->print, ODR_OCTETSTRING,
+                            (char*) (*p)->buf, (*p)->len);
         odr_printf(o, "\n");
-       return 1;
+        return 1;
     }
     if (o->direction == ODR_DECODE)
     {
-       *p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
-       (*p)->size= 0;
-       (*p)->len = 0;
-       (*p)->buf = 0;
+        *p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
+        (*p)->len = 0;
+        (*p)->buf = 0;
     }
     if (ber_octetstring(o, *p, cons))
-       return 1;
+        return 1;
     odr_seterror(o, OOTHER, 43);
     return 0;
 }
@@ -65,40 +63,40 @@ int odr_cstring(ODR o, char **p, int opt, const char *name)
     Odr_oct *t;
 
     if (o->error)
-       return 0;
-    if (o->t_class < 0)
+        return 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)
-       return 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);
+        return odr_missing(o, opt, name);
     if (o->direction == ODR_PRINT)
     {
-       odr_prname(o, name);
-       odr_printf(o, "'%s'\n", *p);
-       return 1;
+        odr_prname(o, name);
+        odr_printf(o, "'%s'\n", *p);
+        return 1;
     }
     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;
+        t->len = 0;
+        t->buf = 0;
     }
     if (!ber_octetstring(o, t, cons))
-       return 0;
+        return 0;
     if (o->direction == ODR_DECODE)
     {
-       *p = (char *) t->buf;
-       *(*p + t->len) = '\0';  /* ber_octs reserves space for this */
+        *p = (char *) t->buf;
+        *(*p + t->len) = '\0';  /* ber_octs reserves space for this */
     }
     return 1;
 }
@@ -112,21 +110,22 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
     Odr_oct *t;
 
     if (o->error)
-       return 0;
-    if (o->t_class < 0)
+        return 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)
-       return 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);
+        return odr_missing(o, opt, name);
     if (o->direction == ODR_PRINT)
     {
-       odr_prname(o, name);
-       odr_printf(o, "'%s'\n", *p);
-       return 1;
+        odr_prname(o, name);
+        odr_printf(o, "'%s'\n", *p);
+        return 1;
     }
     t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
     if (o->direction == ODR_ENCODE)
@@ -140,32 +139,39 @@ 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;
+        t->len = 0;
+        t->buf = 0;
     }
     if (!ber_octetstring(o, t, cons))
-       return 0;
+        return 0;
     if (o->direction == ODR_DECODE)
     {
         *p = 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)
@@ -199,3 +212,12 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
     }
     return 1;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+