X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_bool.c;h=6161b33b637b172792c31cc32475198d697b2a4d;hb=5f4456fa00e080d850f7e25aba2f1e12cab8adcf;hp=f50fdb693127ca779e7794aaf509809a15acf44f;hpb=a7d28a25277a208edb9c44d124f179cc2be6db70;p=yaz-moved-to-github.git

diff --git a/odr/ber_bool.c b/odr/ber_bool.c
index f50fdb6..6161b33 100644
--- a/odr/ber_bool.c
+++ b/odr/ber_bool.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_bool.c,v $
- * Revision 1.1  1995-02-02 16:21:51  quinn
+ * Revision 1.4  1995-03-21 10:17:27  quinn
+ * Fixed little bug in decoder.
+ *
+ * Revision 1.3  1995/03/08  12:12:06  quinn
+ * Added better error checking.
+ *
+ * Revision 1.2  1995/02/09  15:51:45  quinn
+ * Works better now.
+ *
+ * Revision 1.1  1995/02/02  16:21:51  quinn
  * First kick.
  *
  */
@@ -15,34 +24,51 @@
 
 int ber_boolean(ODR o, int *val)
 {
-    unsigned char *b = o->bp;
     int res, len;
 
     switch (o->direction)
     {
     	case ODR_ENCODE:
+	    if (!o->left)
+	    {
+	    	o->error = OSPACE;
+		return 0;
+	    }
 	    if (ber_enclen(o->bp, 1, 1, 1) != 1)
+	    {
+	    	o->error = OOTHER;
 		return 0;
+	    }
 	    o->bp++;
 	    o->left--;
 	    *(o->bp++) = (unsigned char) *val;
+#ifdef ODR_DEBUG
 	    fprintf(stderr, "[val=%d]\n", *val);
+#endif
 	    o->left--;
 	    return 1;
 	case ODR_DECODE:
-	    if ((res = ber_declen(b, &len)) < 0)
+	    if ((res = ber_declen(o->bp, &len)) < 0)
+	    {
+	    	o->error = OPROTO;
 		return 0;
+	    }
 	    if (len != 1)
+	    {
+	    	o->error = OPROTO;
 		return 0;
+	    }
 	    o->bp+= res;
 	    o->left -= res;
-	    *val = *b;
+	    *val = *o->bp;
 	    o->bp++;
 	    o->left--;
+#ifdef ODR_DEBUG
 	    fprintf(stderr, "[val=%d]\n", *val);
+#endif
 	    return 1;
 	case ODR_PRINT:
 	    return 1;
-	default: return 0;
+	default: o->error = OOTHER; return 0;
     }
 }