Added odr_constructed_more check

[yaz-moved-to-github.git] / odr / ber_bool.c

diff --git a/odr/ber_bool.c b/odr/ber_bool.c
index f50fdb6..d7f749e 100644 (file)
--- a/odr/ber_bool.c
+++ b/odr/ber_bool.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_bool.c,v $
- * Revision 1.1  1995-02-02 16:21:51  quinn
+ * 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.
  *
  */
@@ -21,28 +27,46 @@ int ber_boolean(ODR o, int *val)
     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)
+           {
+               o->error = OPROTO;
                return 0;
+           }
            if (len != 1)
+           {
+               o->error = OPROTO;
                return 0;
+           }
            o->bp+= res;
            o->left -= res;
            *val = *b;
            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;
     }
 }