* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_cons.c,v $
- * Revision 1.5 1995-02-10 18:57:25 quinn
+ * 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
+ * Added better error checking.
+ *
+ * Revision 1.5 1995/02/10 18:57:25 quinn
* More in the way of error-checking.
*
* Revision 1.4 1995/02/10 15:55:29 quinn
int res;
int cons = 1;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = class;
o->t_tag = tag;
}
- if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons)) < 0)
+ if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, 1)) < 0)
return 0;
if (!res || !cons)
return 0;
+ if (o->stackp == ODR_MAX_STACK - 1)
+ {
+ o->error = OSTACK;
+ return 0;
+ }
o->stack[++(o->stackp)].lenb = o->bp;
if (o->direction == ODR_ENCODE || o->direction == ODR_PRINT)
{
int odr_constructed_more(ODR o)
{
+ if (o->error)
+ return 0;
if (o->stackp < 0)
return 0;
if (o->stack[o->stackp].len >= 0)
{
int res;
+ if (o->error)
+ return 0;
if (o->stackp < 0)
+ {
+ o->error = OOTHER;
return 0;
+ }
switch (o->direction)
{
case ODR_DECODE:
if (*o->bp++ == 0 && *(o->bp++) == 0)
{
o->left -= 2;
+ o->stackp--;
return 1;
}
else
+ {
+ o->error = OOTHER;
return 0;
+ }
}
else if (o->bp - o->stack[o->stackp].base !=
o->stack[o->stackp].len)
+ {
+ o->error = OOTHER;
return 0;
+ }
o->stackp--;
return 1;
case ODR_ENCODE:
if ((res = ber_enclen(o->stack[o->stackp].lenb,
o->bp - o->stack[o->stackp].base,
o->stack[o->stackp].lenlen, 1)) < 0)
- return 0;
+ {
+ o->error = OSPACE;
+ return 0;
+ }
if (res == 0) /* indefinite encoding */
{
*(o->bp++) = *(o->bp++) = 0;
o->stackp--;
return 1;
case ODR_PRINT: return 1;
- default: return 0;
+ default:
+ o->error = OOTHER;
+ return 0;
}
}