X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fber_oct.c;h=5a36482750315d623709602d7df559c2e392cbda;hb=80559dbf0a5d6993eef844e6f6198d28ff5a44fa;hp=a31ba85db5772b23ae8af362c60c189b864d972f;hpb=8d691989077a0addcbd840d769dce6700f3d9622;p=yaz-moved-to-github.git

diff --git a/src/ber_oct.c b/src/ber_oct.c
index a31ba85..5a36482 100644
--- a/src/ber_oct.c
+++ b/src/ber_oct.c
@@ -1,11 +1,9 @@
-/*
- * Copyright (C) 1995-2007, 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.5 2007-01-03 08:42:15 adam Exp $
  */
 
-/** 
+/**
  * \file ber_oct.c
  * \brief Implements ber_octetstring
  *
@@ -18,12 +16,13 @@
 #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;
-    unsigned char *c;
+    const char *base;
 
     switch (o->direction)
     {
@@ -53,21 +52,11 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
             odr_seterror(o, OOTHER, 16);
             return 0;
         }
-        if (len + 1 > p->size - p->len)
-        {
-            c = (unsigned char *)odr_malloc(o, p->size += len + 1);
-            if (p->len)
-                memcpy(c, p->buf, p->len);
-            p->buf = c;
-        }
-        if (len)
-            memcpy(p->buf + p->len, o->bp, len);
-        p->len += len;
+        p->len = len;
+        p->buf = odr_malloc(o, len + 1);
+        memcpy(p->buf, o->bp, len);
+        p->buf[len] = '\0';
         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';
         return 1;
     case ODR_ENCODE:
         if ((res = ber_enclen(o, p->len, 5, 0)) < 0)
@@ -87,6 +76,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