X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fber_oct.c;h=25829c10ee9076166e6a3c8203cf3ae2c426252a;hp=593cc119538f678f1e78907838e10ab0eb277b04;hb=c82db01c9fc0b51254ec6ead5fe3b503ca098ca0;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505

diff --git a/src/ber_oct.c b/src/ber_oct.c
index 593cc11..25829c1 100644
--- a/src/ber_oct.c
+++ b/src/ber_oct.c
@@ -1,11 +1,9 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_oct.c,v 1.4 2005-06-25 15:46:03 adam Exp $
  */
 
-/** 
+/**
  * \file ber_oct.c
  * \brief Implements ber_octetstring
  *
@@ -18,12 +16,16 @@
 #endif
 
 #include "odr-priv.h"
+#include <yaz/log.h>
+#include <assert.h>
 
 int ber_octetstring(ODR o, Odr_oct *p, int cons)
 {
     int res, len;
-    const unsigned char *base;
+    const char *base;
+#if OCT_SIZE
     unsigned char *c;
+#endif
 
     switch (o->direction)
     {
@@ -53,9 +55,14 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
             odr_seterror(o, OOTHER, 16);
             return 0;
         }
+#if OCT_SIZE
+        assert(p->size == 0);
+        assert(p->len == 0);
+        yaz_log(YLOG_LOG, "DECODE OCTET1 p->size=%d p->len=%d", p->size, p->len);
         if (len + 1 > p->size - p->len)
         {
             c = (unsigned char *)odr_malloc(o, p->size += len + 1);
+            yaz_log(YLOG_LOG, "DECODE COPY p->size=%d p->len=%d", p->size, p->len);
             if (p->len)
                 memcpy(c, p->buf, p->len);
             p->buf = c;
@@ -63,11 +70,19 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
         if (len)
             memcpy(p->buf + p->len, o->bp, len);
         p->len += len;
+        yaz_log(YLOG_LOG, "DECODE OCTET2 p->size=%d p->len=%d", p->size, p->len);
         o->bp += len;
         /* the final null is really not part of the buffer, but */
         /* it helps somes applications that assumes C strings */
         if (len)
             p->buf[p->len] = '\0';
+#else
+        p->len = len;
+        p->buf = odr_malloc(o, len + 1);
+        memcpy(p->buf, o->bp, len);
+        p->buf[len] = '\0';
+        o->bp += len;
+#endif
         return 1;
     case ODR_ENCODE:
         if ((res = ber_enclen(o, p->len, 5, 0)) < 0)
@@ -87,6 +102,7 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab