When BER decoding a null byte is appended to the OCTET buffer.

[yaz-moved-to-github.git] / odr / ber_oct.c

diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index 9680424..3c1cfd6 100644 (file)
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oct.c,v $
- * Revision 1.15  2000-01-31 13:15:21  adam
+ * Revision 1.17  2001-06-26 12:14:15  adam
+ * When BER decoding a null byte is appended to the OCTET buffer.
+ *
+ * Revision 1.16  2000/02/29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.15  2000/01/31 13:15:21  adam
  * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
  * that some characters are not surrounded by spaces in resulting term.
  * ILL-code updates.
@@ -54,6 +60,9 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <yaz/odr.h>
 
@@ -90,11 +99,19 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
            {
                c = (unsigned char *)odr_malloc(o, p->size += len + 1);
                if (p->len)
+               {
                    memcpy(c, p->buf, p->len);
+                   /* the final null is really not part of the buffer, but */
+                   /* it saves somes applications that assumes C strings */
+                   c[p->len] = '\0';
+               }
                p->buf = c;
            }
            if (len)
+           {
                memcpy(p->buf + p->len, o->bp, len);
+               p->buf[p->len] = '\0';  /* make it a C string, just in case */
+           }
            p->len += len;
            o->bp += len;
            return 1;