X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_oct.c;h=a8f6e078fb1a8419c52083b0a63a33de8a472ed2;hb=6c126e94642b41867fb323ff39fded733757a11e;hp=1114aa6329287b0908acc4d8eef88019865e4624;hpb=32226b4f15d634d5e48b1306aeeb26a370c8f5c5;p=yaz-moved-to-github.git

diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index 1114aa6..a8f6e07 100644
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oct.c,v $
- * Revision 1.3  1995-02-03 17:04:34  quinn
+ * Revision 1.4  1995-02-10 15:55:28  quinn
+ * Bug fixes, mostly.
+ *
+ * Revision 1.3  1995/02/03  17:04:34  quinn
  * *** empty log message ***
  *
  * Revision 1.2  1995/02/02  20:38:50  quinn
@@ -40,16 +43,15 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
 	    /* primitive octetstring */
 	    if (len < 0)
 	    	return 0;
-	    if (len == 0)
-	    	return 1;
-	    if (len > p->size - p->len)
+	    if (len + 1 > p->size - p->len)
 	    {
 	    	c = nalloc(o, p->size += len + 1);
 	    	if (p->len)
 		    memcpy(c, p->buf, p->len);
 		p->buf = c;
 	    }
-	    memcpy(p->buf + p->len, o->bp, len);
+	    if (len)
+		memcpy(p->buf + p->len, o->bp, len);
 	    p->len += len;
 	    o->bp += len;
 	    o->left -= len;