X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_bit.c;h=d82e116e27537ddb35bc6a2c47276980f391d64c;hb=c80275992d29b4815dd25d9203e094ae2880f1ae;hp=3ab4ed0a2aa4d209fb0b4b0839d00775c3b83e41;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git

diff --git a/odr/ber_bit.c b/odr/ber_bit.c
index 3ab4ed0..d82e116 100644
--- a/odr/ber_bit.c
+++ b/odr/ber_bit.c
@@ -1,45 +1,16 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: ber_bit.c,v $
- * Revision 1.10  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.9  1999/04/20 09:56:48  adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.8  1999/01/08 11:23:21  adam
- * Added const modifier to some of the BER/ODR encoding routines.
- *
- * Revision 1.7  1995/09/29 17:12:16  quinn
- * Smallish
- *
- * Revision 1.6  1995/09/27  15:02:54  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.5  1995/05/16  08:50:43  quinn
- * License, documentation, and memory fixes
- *
- * 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.16 2003-05-20 19:50:12 adam Exp $
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <yaz/odr.h>
+#include "odr-priv.h"
 
 int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 {
@@ -48,54 +19,59 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 
     switch (o->direction)
     {
-    	case ODR_DECODE:
-	    if ((res = ber_declen(o->bp, &len)) < 0)
-	    {
-	    	o->error = OPROTO;
-	    	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, 0))
-		    	return 0;
-		return 1;
-	    }
-	    /* primitive bitstring */
-	    if (len < 0)
-	    {
-	    	o->error = OOTHER;
-	    	return 0;
-	    }
-	    if (len == 0)
-	    	return 1;
-	    if (len - 1 > ODR_BITMASK_SIZE)
-	    {
-	    	o->error = OOTHER;
-	    	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)
-	    	return 0;
-	    if (odr_putc(o, 0) < 0)    /* no unused bits here */
-	    	return 0;
-	    if (p->top < 0)
-	    	return 1;
-	    if (odr_write(o, p->bits, p->top + 1) < 0)
-	    	return 0;
-	    return 1;
-    	case ODR_PRINT: return 1;
-    	default: o->error = OOTHER; return 0;
+    case ODR_DECODE:
+        if ((res = ber_declen(o->bp, &len, odr_max(o))) < 0)
+        {
+            odr_seterror(o, OPROTO, 4);
+            return 0;
+        }
+        o->bp += res;
+        if (cons)       /* fetch component strings */
+        {
+            base = o->bp;
+            while (odp_more_chunks(o, base, len))
+                if (!odr_bitstring(o, &p, 0, 0))
+                    return 0;
+            return 1;
+        }
+        /* primitive bitstring */
+        if (len < 0)
+        {
+            odr_seterror(o, OOTHER, 5);
+            return 0;
+        }
+        if (len == 0)
+            return 1;
+        if (len - 1 > ODR_BITMASK_SIZE)
+        {
+            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);
+        p->top += len;
+        o->bp += len;
+        return 1;
+    case ODR_ENCODE:
+        if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0)
+            return 0;
+        if (odr_putc(o, 0) < 0)    /* no unused bits here */
+            return 0;
+        if (p->top < 0)
+            return 1;
+        if (odr_write(o, p->bits, p->top + 1) < 0)
+            return 0;
+        return 1;
+    case ODR_PRINT:
+        return 1;
+    default: 
+        odr_seterror(o, OOTHER, 8);
+        return 0;
     }
 }