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
Modified makefile to use common lib
[yaz-moved-to-github.git]
/
odr
/
odr_cons.c
diff --git
a/odr/odr_cons.c
b/odr/odr_cons.c
index
f85d817
..
85735dc
100644
(file)
--- a/
odr/odr_cons.c
+++ b/
odr/odr_cons.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_cons.c,v $
* 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
* More in the way of error-checking.
*
* Revision 1.4 1995/02/10 15:55:29 quinn
@@
-28,16
+34,23
@@
int odr_constructed_begin(ODR o, void *p, int class, int tag)
int res;
int cons = 1;
int res;
int cons = 1;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = class;
o->t_tag = tag;
}
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;
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)
{
o->stack[++(o->stackp)].lenb = o->bp;
if (o->direction == ODR_ENCODE || o->direction == ODR_PRINT)
{
@@
-61,6
+74,8
@@
int odr_constructed_begin(ODR o, void *p, int class, int tag)
int odr_constructed_more(ODR o)
{
int odr_constructed_more(ODR o)
{
+ if (o->error)
+ return 0;
if (o->stackp < 0)
return 0;
if (o->stack[o->stackp].len >= 0)
if (o->stackp < 0)
return 0;
if (o->stack[o->stackp].len >= 0)
@@
-73,8
+88,13
@@
int odr_constructed_end(ODR o)
{
int res;
{
int res;
+ if (o->error)
+ return 0;
if (o->stackp < 0)
if (o->stackp < 0)
+ {
+ o->error = OOTHER;
return 0;
return 0;
+ }
switch (o->direction)
{
case ODR_DECODE:
switch (o->direction)
{
case ODR_DECODE:
@@
-83,21
+103,31
@@
int odr_constructed_end(ODR o)
if (*o->bp++ == 0 && *(o->bp++) == 0)
{
o->left -= 2;
if (*o->bp++ == 0 && *(o->bp++) == 0)
{
o->left -= 2;
+ o->stackp--;
return 1;
}
else
return 1;
}
else
+ {
+ o->error = OOTHER;
return 0;
return 0;
+ }
}
else if (o->bp - o->stack[o->stackp].base !=
o->stack[o->stackp].len)
}
else if (o->bp - o->stack[o->stackp].base !=
o->stack[o->stackp].len)
+ {
+ o->error = OOTHER;
return 0;
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)
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;
if (res == 0) /* indefinite encoding */
{
*(o->bp++) = *(o->bp++) = 0;
@@
-106,6
+136,8
@@
int odr_constructed_end(ODR o)
o->stackp--;
return 1;
case ODR_PRINT: return 1;
o->stackp--;
return 1;
case ODR_PRINT: return 1;
- default: return 0;
+ default:
+ o->error = OOTHER;
+ return 0;
}
}
}
}