X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_any.c;h=2e9a3ce264cd328b8b3958148389e882089fe53f;hb=396d0ccd2549e6f31cf1f9adc1c19a97d3a7b0de;hp=71846df233a370eb0dc510105e84abedcb3d95ff;hpb=6d0cb38e2fd32c722b0af63ce050ac5c458d849f;p=yaz-moved-to-github.git

diff --git a/odr/ber_any.c b/odr/ber_any.c
index 71846df..2e9a3ce 100644
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_any.c,v $
- * Revision 1.3  1995-02-10 18:57:24  quinn
+ * Revision 1.7  1995-03-17 10:17:39  quinn
+ * Added memory management.
+ *
+ * Revision 1.6  1995/03/08  12:12:02  quinn
+ * Added better error checking.
+ *
+ * Revision 1.5  1995/02/14  20:39:54  quinn
+ * Fixed bugs in completeBER and (serious one in) ber_oid.
+ *
+ * Revision 1.4  1995/02/14  11:54:33  quinn
+ * Adjustments.
+ *
+ * Revision 1.3  1995/02/10  18:57:24  quinn
  * More in the way of error-checking.
  *
  * Revision 1.2  1995/02/10  15:55:28  quinn
@@ -24,9 +36,12 @@ int ber_any(ODR o, Odr_any **p)
     switch (o->direction)
     {
     	case ODR_DECODE:
-	    if ((res = completeBER(o->bp, 1000)) <= 0)        /* FIX THIS */
+	    if ((res = completeBER(o->bp, o->left)) <= 0)        /* FIX THIS */
+	    {
+	    	o->error = OPROTO;
 	    	return 0;
-	    (*p)->buf = nalloc(o, res);
+	    }
+	    (*p)->buf = odr_malloc(o, res);
 	    memcpy((*p)->buf, o->bp, res);
 	    (*p)->len = (*p)->size = res;
 	    o->bp += res;
@@ -34,23 +49,28 @@ int ber_any(ODR o, Odr_any **p)
 	    return 1;
     	case ODR_ENCODE:
 	    if ((*p)->len > o->left)
+	    {
+	    	o->error = OSPACE;
 	    	return 0;
+	    }
 	    memcpy(o->bp , (*p)->buf, (*p)->len);
 	    o->bp += (*p)->len;
 	    o->left -= (*p)->len;
 	    return 1;
-    	default: return 0;
+    	default: o->error = OOTHER; return 0;
     }
 }
 
 /*
- * Return length of BER-package or -1.
+ * Return length of BER-package or 0.
  */
 int completeBER(unsigned char *buf, int len)
 {
     int res, ll, class, tag, cons;
     unsigned char *b = buf;
     
+    if (!len)
+    	return 0;
     if (!buf[0] && !buf[1])
     	return 0;
     if ((res = ber_dectag(b, &class, &tag, &cons)) <= 0)
@@ -66,18 +86,18 @@ int completeBER(unsigned char *buf, int len)
     b += res;
     len -= res;
     if (ll >= 0)
-    	return (len >= ll ? ll + (b-buf) : -1);
+    	return (len >= ll ? ll + (b-buf) : 0);
     if (!cons)
     	return 0;    
-    while (1)
+    /* constructed - cycle through children */
+    while (len >= 2)
     {
-	if ((res = completeBER(b, len)) < 0)
+	if (*b == 0 && *(b + 1) == 0)
+	    break;
+	if (!(res = completeBER(b, len)))
 	    return 0;
 	b += res;
 	len -= res;
-	if (len < 2)
-	    return 0;
-	if (*b == 0 && *(b + 1) == 0)
-	    return (b - buf) + 2;
     }
+    return (b - buf) + 2;
 }