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

diff --git a/odr/ber_bit.c b/odr/ber_bit.c
index ce8e21a..d82e116 100644
--- a/odr/ber_bit.c
+++ b/odr/ber_bit.c
@@ -1,68 +1,77 @@
 /*
- * 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.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 <odr.h>
+#include "odr-priv.h"
 
-int ber_bitstring(ODR o, ODR_BITMASK *p, int cons)
+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)
-	    	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))
-		    	return 0;
-		return 1;
-	    }
-	    /* primitive bitstring */
-	    if (len < 0)
-	    	return 0;
-	    if (len == 0)
-	    	return 1;
-	    if (len - 1 > ODR_BITMASK_SIZE)
-	    	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->bp, p->top + 2, 5, 0)) < 0)
-	    	return 0;
-	    o->bp += res;
-	    o->left -= res;
-	    if (p->top + 2 > o->left)
-	    	return 0;
-	    *(o->bp++) = 0;    /* no unused bits here */
-	    o->left--;
-	    if (p->top < 0)
-	    	return 1;
-	    memcpy(o->bp, p->bits, p->top + 1);
-	    o->bp += p->top + 1;
-	    o->left -= p->top +1;
-	    return 1;
-    	case ODR_PRINT: return 1;
-    	default: 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;
     }
 }