From fb2db0abc51ed82583dc4600fd4ff035c96f7d79 Mon Sep 17 00:00:00 2001 From: Sebastian Hammer Date: Tue, 14 Feb 1995 11:54:33 +0000 Subject: [PATCH] Adjustments. --- odr/ber_any.c | 11 +++++++---- odr/ber_tag.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/odr/ber_any.c b/odr/ber_any.c index 71846df..84d07a6 100644 --- a/odr/ber_any.c +++ b/odr/ber_any.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_any.c,v $ - * Revision 1.3 1995-02-10 18:57:24 quinn + * Revision 1.4 1995-02-14 11:54:33 quinn + * Adjustments. + * + * Revision 1.3 1995/02/10 18:57:24 quinn * More in the way of error-checking. * * Revision 1.2 1995/02/10 15:55:28 quinn @@ -44,7 +47,7 @@ int ber_any(ODR o, Odr_any **p) } /* - * Return length of BER-package or -1. + * Return length of BER-package or 0. */ int completeBER(unsigned char *buf, int len) { @@ -66,12 +69,12 @@ int completeBER(unsigned char *buf, int len) b += res; len -= res; if (ll >= 0) - return (len >= ll ? ll + (b-buf) : -1); + return (len >= ll ? ll + (b-buf) : 0); if (!cons) return 0; while (1) { - if ((res = completeBER(b, len)) < 0) + if (!(res = completeBER(b, len))) return 0; b += res; len -= res; diff --git a/odr/ber_tag.c b/odr/ber_tag.c index 1c53686..c5ec9eb 100644 --- a/odr/ber_tag.c +++ b/odr/ber_tag.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_tag.c,v $ - * Revision 1.5 1995-02-10 18:57:24 quinn + * 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 @@ -44,8 +47,11 @@ int ber_tag(ODR o, void *p, int class, int tag, int *constructed) 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: -- 1.7.10.4