X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_bit.c;h=33ce6b1be531d435dc87141d43f2364fce50b123;hb=006c3df264a95c03bfc557b2004595fc6cc3ee14;hp=17332266f108af4d38609922ac3414fd68b0b8e7;hpb=569f86b4615c2731727be2a0ff898d36f9725819;p=yaz-moved-to-github.git

diff --git a/odr/ber_bit.c b/odr/ber_bit.c
index 1733226..33ce6b1 100644
--- a/odr/ber_bit.c
+++ b/odr/ber_bit.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 1995-2002, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: ber_bit.c,v 1.13 2002-07-25 12:51:08 adam Exp $
+ * $Id: ber_bit.c,v 1.15 2003-03-11 11:03:31 adam Exp $
  *
  */
 #if HAVE_CONFIG_H
@@ -20,9 +20,9 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
     switch (o->direction)
     {
     	case ODR_DECODE:
-	    if ((res = ber_declen(o->bp, &len)) < 0)
+	    if ((res = ber_declen(o->bp, &len, odr_max(o))) < 0)
 	    {
-	    	o->error = OPROTO;
+                odr_seterror(o, OPROTO, 4);
 	    	return 0;
 	    }
 	    o->bp += res;
@@ -37,16 +37,21 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 	    /* primitive bitstring */
 	    if (len < 0)
 	    {
-	    	o->error = OOTHER;
+                odr_seterror(o, OOTHER, 5);
 	    	return 0;
 	    }
 	    if (len == 0)
 	    	return 1;
 	    if (len - 1 > ODR_BITMASK_SIZE)
 	    {
-	    	o->error = OOTHER;
+                odr_seterror(o, OOTHER, 6);
 	    	return 0;
 	    }
+            if (len > odr_max(o))
+            {
+                odr_seterror(o, OOTHER, 7);
+                return 0;
+            }
 	    o->bp++;      /* silently ignore the unused-bits field */
 	    len--;
 	    memcpy(p->bits + p->top + 1, o->bp, len);
@@ -64,6 +69,6 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 	    	return 0;
 	    return 1;
     	case ODR_PRINT: return 1;
-    	default: o->error = OOTHER; return 0;
+    	default: odr_seterror(o, OOTHER, 8); return 0;
     }
 }