projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Smallish changes.
[yaz-moved-to-github.git]
/
odr
/
ber_any.c
diff --git
a/odr/ber_any.c
b/odr/ber_any.c
index
71846df
..
35c0a83
100644
(file)
--- a/
odr/ber_any.c
+++ b/
odr/ber_any.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_any.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_any.c,v $
- * Revision 1.3 1995-02-10 18:57:24 quinn
+ * Revision 1.5 1995-02-14 20:39:54 quinn
+ * Fixed bugs in completeBER and (serious one in) ber_oid.
+ *
+ * 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
* More in the way of error-checking.
*
* Revision 1.2 1995/02/10 15:55:28 quinn
@@
-44,13
+50,15
@@
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)
{
int res, ll, class, tag, cons;
unsigned char *b = buf;
*/
int completeBER(unsigned char *buf, int len)
{
int res, ll, class, tag, cons;
unsigned char *b = buf;
+ if (!len)
+ return 0;
if (!buf[0] && !buf[1])
return 0;
if ((res = ber_dectag(b, &class, &tag, &cons)) <= 0)
if (!buf[0] && !buf[1])
return 0;
if ((res = ber_dectag(b, &class, &tag, &cons)) <= 0)
@@
-66,18
+74,18
@@
int completeBER(unsigned char *buf, int len)
b += res;
len -= res;
if (ll >= 0)
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;
if (!cons)
return 0;
- while (1)
+ /* constructed - cycle through children */
+ while (len >= 2)
{
{
- if ((res = completeBER(b, len)) < 0)
+ if (*b == 0 && *(b + 1) == 0)
+ break;
+ if (!(res = completeBER(b, len)))
return 0;
b += res;
len -= res;
return 0;
b += res;
len -= res;
- if (len < 2)
- return 0;
- if (*b == 0 && *(b + 1) == 0)
- return (b - buf) + 2;
}
}
+ return (b - buf) + 2;
}
}