X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_oct.c;h=e12fedbe4c4fb692d4a0894dc244ddaef246ea16;hb=695e6df9fce9b838cb3fe8f49b211ed99943caef;hp=91c0e9d767cde3f5b8912b62eed8c9985109ff2f;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git

diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index 91c0e9d..e12fedb 100644
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -1,10 +1,24 @@
 /*
- * 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.14  1999-11-30 13:47:11  adam
+ * Revision 1.18  2001-06-26 13:03:48  adam
+ * Bug fix: introduced by previous commit.
+ *
+ * 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
@@ -49,6 +63,9 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <yaz/odr.h>
 
@@ -67,7 +84,6 @@ 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;
@@ -93,7 +109,10 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
 		memcpy(p->buf + p->len, o->bp, len);
 	    p->len += len;
 	    o->bp += len;
-	    o->left -= 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)