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
The rudiments of an asynchronous server.
[yaz-moved-to-github.git]
/
odr
/
ber_any.c
diff --git
a/odr/ber_any.c
b/odr/ber_any.c
index
84d07a6
..
6492398
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.4 1995-02-14 11:54:33 quinn
+ * Revision 1.6 1995-03-08 12:12:02 quinn
+ * Added better error checking.
+ *
+ * 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
* Adjustments.
*
* Revision 1.3 1995/02/10 18:57:24 quinn
@@
-27,8
+33,11
@@
int ber_any(ODR o, Odr_any **p)
switch (o->direction)
{
case ODR_DECODE:
switch (o->direction)
{
case ODR_DECODE:
- if ((res = completeBER(o->bp, 1000)) <= 0) /* FIX THIS */
+ if ((res = completeBER(o->bp, o->left)) <= 0) /* FIX THIS */
+ {
+ o->error = OPROTO;
return 0;
return 0;
+ }
(*p)->buf = nalloc(o, res);
memcpy((*p)->buf, o->bp, res);
(*p)->len = (*p)->size = res;
(*p)->buf = nalloc(o, res);
memcpy((*p)->buf, o->bp, res);
(*p)->len = (*p)->size = res;
@@
-37,12
+46,15
@@
int ber_any(ODR o, Odr_any **p)
return 1;
case ODR_ENCODE:
if ((*p)->len > o->left)
return 1;
case ODR_ENCODE:
if ((*p)->len > o->left)
+ {
+ o->error = OSPACE;
return 0;
return 0;
+ }
memcpy(o->bp , (*p)->buf, (*p)->len);
o->bp += (*p)->len;
o->left -= (*p)->len;
return 1;
memcpy(o->bp , (*p)->buf, (*p)->len);
o->bp += (*p)->len;
o->left -= (*p)->len;
return 1;
- default: return 0;
+ default: o->error = OOTHER; return 0;
}
}
}
}
@@
-54,6
+66,8
@@
int completeBER(unsigned char *buf, int len)
int res, ll, class, tag, cons;
unsigned char *b = buf;
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)
@@
-72,15
+86,15
@@
int completeBER(unsigned char *buf, int len)
return (len >= ll ? ll + (b-buf) : 0);
if (!cons)
return 0;
return (len >= ll ? ll + (b-buf) : 0);
if (!cons)
return 0;
- while (1)
+ /* constructed - cycle through children */
+ while (len >= 2)
{
{
+ if (*b == 0 && *(b + 1) == 0)
+ break;
if (!(res = completeBER(b, len)))
return 0;
b += res;
len -= res;
if (!(res = completeBER(b, len)))
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;
}
}