From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 26 Jun 2001 12:14:15 +0000 (+0000)
Subject: When BER decoding a null byte is appended to the OCTET buffer.
X-Git-Tag: YAZ.1.8~78
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=9a13337111b32d256182a4248f93ebe26e393059;p=yaz-moved-to-github.git

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

diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index 898ad4d..3c1cfd6 100644
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -1,10 +1,13 @@
 /*
- * Copyright (c) 1995-2000, 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.16  2000-02-29 13:44:55  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
@@ -96,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;