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 little bug in decoder.
[yaz-moved-to-github.git]
/
odr
/
odr_int.c
diff --git
a/odr/odr_int.c
b/odr/odr_int.c
index
d617ea8
..
c5ba969
100644
(file)
--- a/
odr/odr_int.c
+++ b/
odr/odr_int.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_int.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_int.c,v $
- * Revision 1.4 1995-02-10 18:57:25 quinn
+ * Revision 1.6 1995-03-17 10:17:51 quinn
+ * Added memory management.
+ *
+ * Revision 1.5 1995/03/08 12:12:25 quinn
+ * Added better error checking.
+ *
+ * Revision 1.4 1995/02/10 18:57:25 quinn
* More in the way of error-checking.
*
* Revision 1.3 1995/02/09 15:51:48 quinn
* More in the way of error-checking.
*
* Revision 1.3 1995/02/09 15:51:48 quinn
@@
-28,12
+34,14
@@
int odr_integer(ODR o, int **p, int opt)
{
int res, cons = 0;
{
int res, cons = 0;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_INTEGER;
}
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_INTEGER;
}
- 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, opt)) < 0)
return 0;
if (!res)
return opt;
return 0;
if (!res)
return opt;
@@
-43,8
+51,11
@@
int odr_integer(ODR o, int **p, int opt)
return 1;
}
if (cons)
return 1;
}
if (cons)
+ {
+ o->error = OPROTO;
return 0;
return 0;
+ }
if (o->direction == ODR_DECODE)
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(int));
+ *p = odr_malloc(o, sizeof(int));
return ber_integer(o, *p);
}
return ber_integer(o, *p);
}