X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_cons.c;fp=odr%2Fodr_cons.c;h=d3f15823afa1ab8682b1808fcceb196a7ff5076a;hb=70efa832d93f63e4fe7de44b666f3b66ae87c23f;hp=85735dc62fb802eb32d4e868a49c7b3b5d6dc32c;hpb=33821b1729f0afa0cadcecf57fc67fea7138bdab;p=yaz-moved-to-github.git diff --git a/odr/odr_cons.c b/odr/odr_cons.c index 85735dc..d3f1582 100644 --- a/odr/odr_cons.c +++ b/odr/odr_cons.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_cons.c,v $ - * Revision 1.7 1995-03-10 11:44:41 quinn + * 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 @@ -52,6 +55,9 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag) 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; @@ -130,9 +136,19 @@ 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;