X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_bit.c;h=33ce6b1be531d435dc87141d43f2364fce50b123;hb=8bccad6217bd2ba078106a531a9e73e7f3aae4a9;hp=db584143a9963c81147117b351b3f06d2f0c14ed;hpb=aa82967af8f06004b567ad1ed40c67b056c44e7b;p=yaz-moved-to-github.git

diff --git a/odr/ber_bit.c b/odr/ber_bit.c
index db58414..33ce6b1 100644
--- a/odr/ber_bit.c
+++ b/odr/ber_bit.c
@@ -1,70 +1,62 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: ber_bit.c,v $
- * Revision 1.4  1995-04-18 08:15:13  quinn
- * Added dynamic memory allocation on encoding (whew). Code is now somewhat
- * neater. We'll make the same change for decoding one day.
- *
- * Revision 1.3  1995/03/08  12:12:04  quinn
- * Added better error checking.
- *
- * Revision 1.2  1995/02/03  17:04:31  quinn
- * *** empty log message ***
- *
- * Revision 1.1  1995/02/02  20:38:49  quinn
- * Updates.
- *
+ * $Id: ber_bit.c,v 1.15 2003-03-11 11:03:31 adam Exp $
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include "odr-priv.h"
 
 int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 {
     int res, len;
-    unsigned char *base;
+    const unsigned char *base;
 
     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;
-	    o->left -= res;
 	    if (cons)       /* fetch component strings */
 	    {
 	    	base = o->bp;
 	    	while (odp_more_chunks(o, base, len))
-		    if (!odr_bitstring(o, &p, 0))
+		    if (!odr_bitstring(o, &p, 0, 0))
 		    	return 0;
 		return 1;
 	    }
 	    /* 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 */
-	    o->left--;
 	    len--;
 	    memcpy(p->bits + p->top + 1, o->bp, len);
 	    p->top += len;
 	    o->bp += len;
-	    o->left -= len;
 	    return 1;
     	case ODR_ENCODE:
 	    if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0)
@@ -77,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;
     }
 }