Added better error checking.

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

diff --git a/odr/ber_tag.c b/odr/ber_tag.c
index f6c3576..fb16296 100644 (file)
--- a/odr/ber_tag.c
+++ b/odr/ber_tag.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_tag.c,v $
- * Revision 1.4  1995-02-10 15:55:28  quinn
+ * Revision 1.7  1995-03-08 12:12:13  quinn
+ * Added better error checking.
+ *
+ * Revision 1.6  1995/02/14  11:54:33  quinn
+ * Adjustments.
+ *
+ * Revision 1.5  1995/02/10  18:57:24  quinn
+ * More in the way of error-checking.
+ *
+ * Revision 1.4  1995/02/10  15:55:28  quinn
  * Bug fixes, mostly.
  *
  * Revision 1.3  1995/02/09  15:51:46  quinn
@@ -28,24 +37,39 @@
  * On decoding:
  *      if tag && class match up, advance pointer and return 1. set cons.
  *      else leave pointer unchanged. Return 0.
+ *
+ * Should perhaps be odr_tag?
 */
-int ber_tag(ODR o, const void *p, int class, int tag, int *constructed)
+int ber_tag(ODR o, void *p, int class, int tag, int *constructed, int opt)
 {
     static int lclass = -1, ltag, br, lcons; /* save t&c rather than
                                                decoding twice */
     int rd;
+    char **pp = p;
 
+    if (o->direction == ODR_DECODE)
+       *pp = 0;
     o->t_class = -1;
-    if (o->buf == o->bp)   /* This is insurance. It shouldn't be necessary */
+    if (o->stackp < 0)
+    {
+       o->bp = o->buf;
        lclass = -1;
+    }
     switch (o->direction)
     {
        case ODR_ENCODE:
-           if (!p)
+           if (!*pp)
+           {
+               if (!opt)
+                   o->error = OREQUIRED;
                return 0;
+           }
            if ((rd = ber_enctag(o->bp, class, tag, *constructed, o->left))
                <=0)
+           {
+               o->error = OSPACE;
                return -1;
+           }
            o->bp += rd;
            o->left -= rd;
 #ifdef ODR_DEBUG
@@ -55,11 +79,18 @@ int ber_tag(ODR o, const void *p, int class, int tag, int *constructed)
            return 1;
        case ODR_DECODE:
            if (o->stackp > -1 && !odr_constructed_more(o))
+           {
+               if (!opt)
+                   o->error = OREQUIRED;
                return 0;
+           }
            if (lclass < 0)
            {
                if ((br = ber_dectag(o->bp, &lclass, &ltag, &lcons)) <= 0)
-                   return -1;
+               {
+                   o->error = OPROTO;
+                   return 0;
+               }
 #ifdef ODR_DEBUG
                fprintf(stderr, "\n[class=%d,tag=%d,cons=%d]", lclass, ltag,
                    lcons);
@@ -74,9 +105,16 @@ int ber_tag(ODR o, const void *p, int class, int tag, int *constructed)
                return 1;
            }
            else
+           {
+               if (!opt)
+                   o->error = OREQUIRED;
                return 0;
-       case ODR_PRINT: return p != 0;
-       default: return 0;
+           }
+       case ODR_PRINT:
+               if (!*pp && !opt)
+                   o->error = OREQUIRED;
+               return *pp != 0;
+       default: o->error = OOTHER; return 0;
     }
 }