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 00c6f51..4b83085 100644 (file)
--- a/odr/odr_cons.c
+++ b/odr/odr_cons.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_cons.c,v $
- * Revision 1.6  1995-03-08 12:12:23  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
@@ -43,7 +52,15 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag)
     if (!res || !cons)
        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;
@@ -95,6 +112,7 @@ int odr_constructed_end(ODR o)
                if (*o->bp++ == 0 && *(o->bp++) == 0)
                {
                    o->left -= 2;
+                   o->stackp--;
                    return 1;
                }
                else
@@ -121,12 +139,22 @@ int odr_constructed_end(ODR o)
            }
            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;
+       case ODR_PRINT: o->stackp--;  return 1;
        default:
            o->error = OOTHER;
            return 0;