X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_tag.c;h=f6c3576879df17011664847ae7a3a85c1d4e729f;hb=1b06a5c10770ef964044f824a33d4cc8652d8e7a;hp=8c524c0f55825a8f021028c7f9f870724194ebf5;hpb=0dcf720d5b83783f6dba31f44b12513cefdd2f75;p=yaz-moved-to-github.git

diff --git a/odr/ber_tag.c b/odr/ber_tag.c
index 8c524c0..f6c3576 100644
--- a/odr/ber_tag.c
+++ b/odr/ber_tag.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_tag.c,v $
- * Revision 1.2  1995-02-07 17:52:59  quinn
+ * Revision 1.4  1995-02-10 15:55:28  quinn
+ * Bug fixes, mostly.
+ *
+ * Revision 1.3  1995/02/09  15:51:46  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
@@ -30,6 +36,8 @@ int ber_tag(ODR o, const void *p, int class, int tag, int *constructed)
     int rd;
 
     o->t_class = -1;
+    if (o->buf == o->bp)   /* This is insurance. It shouldn't be necessary */
+    	lclass = -1;
     switch (o->direction)
     {
     	case ODR_ENCODE:
@@ -40,16 +48,22 @@ int ber_tag(ODR o, const void *p, int class, int tag, int *constructed)
 		return -1;
 	    o->bp += rd;
 	    o->left -= rd;
+#ifdef ODR_DEBUG
 	    fprintf(stderr, "\n[class=%d,tag=%d,cons=%d]", class, tag,
 		*constructed);
+#endif
 	    return 1;
     	case ODR_DECODE:
+	    if (o->stackp > -1 && !odr_constructed_more(o))
+	    	return 0;
 	    if (lclass < 0)
 	    {
 	    	if ((br = ber_dectag(o->bp, &lclass, &ltag, &lcons)) <= 0)
 		    return -1;
+#ifdef ODR_DEBUG
 		fprintf(stderr, "\n[class=%d,tag=%d,cons=%d]", lclass, ltag,
 		    lcons);
+#endif
 	    }
 	    if (class == lclass && tag == ltag)
 	    {