X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_bit.c;h=db584143a9963c81147117b351b3f06d2f0c14ed;hb=eb9336c6ecfd078b265ee69cef96a3a2dfa04ace;hp=31b528fdb5c759e59952c14bfd20871635ec3248;hpb=32226b4f15d634d5e48b1306aeeb26a370c8f5c5;p=yaz-moved-to-github.git

diff --git a/odr/ber_bit.c b/odr/ber_bit.c
index 31b528f..db58414 100644
--- a/odr/ber_bit.c
+++ b/odr/ber_bit.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_bit.c,v $
- * Revision 1.2  1995-02-03 17:04:31  quinn
+ * 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
@@ -24,7 +31,10 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
     {
     	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 */
@@ -37,11 +47,17 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 	    }
 	    /* 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--;
@@ -51,21 +67,16 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 	    o->left -= len;
 	    return 1;
     	case ODR_ENCODE:
-	    if ((res = ber_enclen(o->bp, p->top + 2, 5, 0)) < 0)
+	    if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0)
 	    	return 0;
-	    o->bp += res;
-	    o->left -= res;
-	    if (p->top + 2 > o->left)
+	    if (odr_putc(o, 0) < 0)    /* no unused bits here */
 	    	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;
+	    if (odr_write(o, p->bits, p->top + 1) < 0)
+	    	return 0;
 	    return 1;
     	case ODR_PRINT: return 1;
-    	default: return 0;
+    	default: o->error = OOTHER; return 0;
     }
 }