Fixed possible buf in proto.c

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

diff --git a/odr/odr_cons.c b/odr/odr_cons.c
index 043bb76..4b83085 100644 (file)
--- a/odr/odr_cons.c
+++ b/odr/odr_cons.c
@@ -4,31 +4,63 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_cons.c,v $
- * Revision 1.1  1995-02-02 16:21:53  quinn
+ * Revision 1.9  1995-03-28 09:15:49  quinn
+ * Fixed bug in the printing mode
+ *
+ * Revision 1.8  1995/03/15  11:18:04  quinn
+ * Fixed serious bug in odr_cons
+ *
+ * Revision 1.7  1995/03/10  11:44:41  quinn
+ * Fixed serious stack-bug in odr_cons_begin
+ *
+ * Revision 1.6  1995/03/08  12:12:23  quinn
+ * Added better error checking.
+ *
+ * Revision 1.5  1995/02/10  18:57:25  quinn
+ * More in the way of error-checking.
+ *
+ * Revision 1.4  1995/02/10  15:55:29  quinn
+ * Bug fixes, mostly.
+ *
+ * Revision 1.3  1995/02/09  15:51:48  quinn
+ * Works better now.
+ *
+ * Revision 1.2  1995/02/07  17:52:59  quinn
+ * A damn mess, but now things work, I think.
+ *
+ * Revision 1.1  1995/02/02  16:21:53  quinn
  * First kick.
  *
  */
 
 #include <odr.h>
 
-int odr_constructed_begin(ODR o, void *p, int class, int tag, int opt)
+int odr_constructed_begin(ODR o, void *p, int class, int tag)
 {
     int res;
     int cons = 1;
 
-    if (o->direction == ODR_ENCODE && !*(char*)p)
-       return opt;
+    if (o->error)
+       return 0;
     if (o->t_class < 0)
     {
        o->t_class = class;
        o->t_tag = tag;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons)) < 0)
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, 1)) < 0)
        return 0;
     if (!res || !cons)
-       return opt;
+       return 0;
 
+    if (o->stackp == ODR_MAX_STACK - 1)
+    {
+       o->error = OSTACK;
+       return 0;
+    }
     o->stack[++(o->stackp)].lenb = o->bp;
+#ifdef ODR_DEBUG
+    fprintf(stderr, "[cons_begin(%d)]", o->stackp);
+#endif
     if (o->direction == ODR_ENCODE || o->direction == ODR_PRINT)
     {
        o->stack[o->stackp].lenlen = 1;
@@ -49,12 +81,29 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag, int opt)
     return 1;
 }
 
+int odr_constructed_more(ODR o)
+{
+    if (o->error)
+       return 0;
+    if (o->stackp < 0)
+       return 0;
+    if (o->stack[o->stackp].len >= 0)
+       return o->bp - o->stack[o->stackp].base < o->stack[o->stackp].len;
+    else
+       return (!(*o->bp == 0 && *(o->bp + 1) == 0));
+}
+
 int odr_constructed_end(ODR o)
 {
     int res;
 
+    if (o->error)
+       return 0;
     if (o->stackp < 0)
+    {
+       o->error = OOTHER;
        return 0;
+    }
     switch (o->direction)
     {
        case ODR_DECODE:
@@ -63,29 +112,51 @@ int odr_constructed_end(ODR o)
                if (*o->bp++ == 0 && *(o->bp++) == 0)
                {
                    o->left -= 2;
+                   o->stackp--;
                    return 1;
                }
                else
+               {
+                   o->error = OOTHER;
                    return 0;
+               }
            }
            else if (o->bp - o->stack[o->stackp].base !=
                o->stack[o->stackp].len)
+           {
+               o->error = OOTHER;
                return 0;
+           }
            o->stackp--;
            return 1;
        case ODR_ENCODE:
            if ((res = ber_enclen(o->stack[o->stackp].lenb,
                o->bp - o->stack[o->stackp].base,
                o->stack[o->stackp].lenlen, 1)) < 0)
-                   return 0;
+           {
+               o->error = OSPACE;
+               return 0;
+           }
            if (res == 0)   /* indefinite encoding */
            {
-               *(o->bp++) = *(o->bp++) = 0;
-               o->left--;
+#ifdef ODR_DEBUG
+               fprintf(stderr, "[cons_end(%d): indefinite]", o->stackp);
+#endif
+               *(o->bp++) = 0;
+               *(o->bp++) = 0;
+               o->left -= 2;
            }
+#ifdef ODR_DEBUG
+           else
+           {
+               fprintf(stderr, "[cons_end(%d): definite]", o->stackp);
+           }
+#endif
            o->stackp--;
            return 1;
-       case ODR_PRINT: return 1;
-       default: return 0;
+       case ODR_PRINT: o->stackp--;  return 1;
+       default:
+           o->error = OOTHER;
+           return 0;
     }
 }