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
Added better error checking.
[yaz-moved-to-github.git]
/
odr
/
ber_tag.c
diff --git
a/odr/ber_tag.c
b/odr/ber_tag.c
index
1c53686
..
fb16296
100644
(file)
--- a/
odr/ber_tag.c
+++ b/
odr/ber_tag.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_tag.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_tag.c,v $
- * Revision 1.5 1995-02-10 18:57:24 quinn
+ * Revision 1.7 1995-03-08 12:12:13 quinn
+ * Added better error checking.
+ *
+ * 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
* More in the way of error-checking.
*
* Revision 1.4 1995/02/10 15:55:28 quinn
@@
-34,7
+40,7
@@
*
* Should perhaps be odr_tag?
*/
*
* Should perhaps be odr_tag?
*/
-int ber_tag(ODR o, void *p, int class, int tag, int *constructed)
+int ber_tag(ODR o, void *p, int class, int tag, int *constructed, int opt)
{
static int lclass = -1, ltag, br, lcons; /* save t&c rather than
decoding twice */
{
static int lclass = -1, ltag, br, lcons; /* save t&c rather than
decoding twice */
@@
-44,16
+50,26
@@
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->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;
lclass = -1;
+ }
switch (o->direction)
{
case ODR_ENCODE:
if (!*pp)
switch (o->direction)
{
case ODR_ENCODE:
if (!*pp)
+ {
+ if (!opt)
+ o->error = OREQUIRED;
return 0;
return 0;
+ }
if ((rd = ber_enctag(o->bp, class, tag, *constructed, o->left))
<=0)
if ((rd = ber_enctag(o->bp, class, tag, *constructed, o->left))
<=0)
+ {
+ o->error = OSPACE;
return -1;
return -1;
+ }
o->bp += rd;
o->left -= rd;
#ifdef ODR_DEBUG
o->bp += rd;
o->left -= rd;
#ifdef ODR_DEBUG
@@
-63,11
+79,18
@@
int ber_tag(ODR o, void *p, int class, int tag, int *constructed)
return 1;
case ODR_DECODE:
if (o->stackp > -1 && !odr_constructed_more(o))
return 1;
case ODR_DECODE:
if (o->stackp > -1 && !odr_constructed_more(o))
+ {
+ if (!opt)
+ o->error = OREQUIRED;
return 0;
return 0;
+ }
if (lclass < 0)
{
if ((br = ber_dectag(o->bp, &lclass, <ag, &lcons)) <= 0)
if (lclass < 0)
{
if ((br = ber_dectag(o->bp, &lclass, <ag, &lcons)) <= 0)
+ {
+ o->error = OPROTO;
return 0;
return 0;
+ }
#ifdef ODR_DEBUG
fprintf(stderr, "\n[class=%d,tag=%d,cons=%d]", lclass, ltag,
lcons);
#ifdef ODR_DEBUG
fprintf(stderr, "\n[class=%d,tag=%d,cons=%d]", lclass, ltag,
lcons);
@@
-82,9
+105,16
@@
int ber_tag(ODR o, void *p, int class, int tag, int *constructed)
return 1;
}
else
return 1;
}
else
+ {
+ if (!opt)
+ o->error = OREQUIRED;
return 0;
return 0;
- case ODR_PRINT: return *pp != 0;
- default: return 0;
+ }
+ case ODR_PRINT:
+ if (!*pp && !opt)
+ o->error = OREQUIRED;
+ return *pp != 0;
+ default: o->error = OOTHER; return 0;
}
}
}
}