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
Fixed serious bug in odr_cons
[yaz-moved-to-github.git]
/
odr
/
odr_seq.c
diff --git
a/odr/odr_seq.c
b/odr/odr_seq.c
index
e08b958
..
cb3d703
100644
(file)
--- a/
odr/odr_seq.c
+++ b/
odr/odr_seq.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_seq.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_seq.c,v $
- * Revision 1.6 1995-02-10 15:55:29 quinn
+ * Revision 1.8 1995-03-15 11:18:05 quinn
+ * Fixed serious bug in odr_cons
+ *
+ * Revision 1.7 1995/03/08 12:12:30 quinn
+ * Added better error checking.
+ *
+ * Revision 1.6 1995/02/10 15:55:29 quinn
* Bug fixes, mostly.
*
* Revision 1.5 1995/02/09 15:51:49 quinn
* Bug fixes, mostly.
*
* Revision 1.5 1995/02/09 15:51:49 quinn
@@
-31,12
+37,13
@@
int odr_sequence_begin(ODR o, void *p, int size)
{
char **pp = (char**) p;
{
char **pp = (char**) p;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_SEQUENCE;
}
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_SEQUENCE;
}
-
if (o->direction == ODR_DECODE)
*pp = 0;
if (odr_constructed_begin(o, p, o->t_class, o->t_tag))
if (o->direction == ODR_DECODE)
*pp = 0;
if (odr_constructed_begin(o, p, o->t_class, o->t_tag))
@@
-108,11
+115,21
@@
int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
}
break;
case ODR_ENCODE: case ODR_PRINT:
}
break;
case ODR_ENCODE: case ODR_PRINT:
+#ifdef ODR_DEBUG
+ fprintf(stderr, "[seqof: num=%d]", *num);
+#endif
for (i = 0; i < *num; i++)
for (i = 0; i < *num; i++)
+ {
+#ifdef ODR_DEBUG
+ fprintf(stderr, "[seqof: elem #%d]", i);
+#endif
if (!(*type)(o, *pp + i, 0))
return 0;
if (!(*type)(o, *pp + i, 0))
return 0;
+ }
break;
break;
- default: return 0;
+ default:
+ o->error = OOTHER;
+ return 0;
}
return odr_sequence_end(o);
}
}
return odr_sequence_end(o);
}