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 e7c91a8..3c1cfd6 100644 (file)
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -1,10 +1,31 @@
 /*
- * Copyright (c) 1995, 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.11  1998-02-11 11:53:34  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.
+ *
+ * Revision 1.14  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.13  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.12  1999/01/08 11:23:24  adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.11  1998/02/11 11:53:34  adam
  * Changed code so that it compiles as C++.
  *
  * Revision 1.10  1995/09/29 17:12:18  quinn
@@ -39,13 +60,17 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include <yaz/odr.h>
 
 int ber_octetstring(ODR o, Odr_oct *p, int cons)
 {
     int res, len;
-    unsigned char *base, *c;
+    const unsigned char *base;
+    unsigned char *c;
 
     switch (o->direction)
     {
@@ -56,12 +81,11 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
                return 0;
            }
            o->bp += res;
-           o->left -= res;
            if (cons)       /* fetch component strings */
            {
                base = o->bp;
                while (odp_more_chunks(o, base, len))
-                   if (!odr_octetstring(o, &p, 0))
+                   if (!odr_octetstring(o, &p, 0, 0))
                        return 0;
                return 1;
            }
@@ -75,14 +99,21 @@ 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;
-           o->left -= len;
            return 1;
        case ODR_ENCODE:
            if ((res = ber_enclen(o, p->len, 5, 0)) < 0)