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
*** empty log message ***
[yaz-moved-to-github.git]
/
odr
/
odr_oid.c
diff --git
a/odr/odr_oid.c
b/odr/odr_oid.c
index
641e117
..
d12226f
100644
(file)
--- a/
odr/odr_oid.c
+++ b/
odr/odr_oid.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oid.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oid.c,v $
- * Revision 1.6 1995-03-01 08:40:56 quinn
+ * Revision 1.8 1995-03-17 10:17:55 quinn
+ * Added memory management.
+ *
+ * Revision 1.7 1995/03/08 12:12:29 quinn
+ * Added better error checking.
+ *
+ * Revision 1.6 1995/03/01 08:40:56 quinn
* Smallish changes.
*
* Revision 1.5 1995/02/10 18:57:26 quinn
* Smallish changes.
*
* Revision 1.5 1995/02/10 18:57:26 quinn
@@
-35,15
+41,22
@@
int odr_oid(ODR o, Odr_oid **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_OID;
}
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OID;
}
- 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;
return 0;
- if (!res || cons)
+ if (!res)
return opt;
return opt;
+ if (cons)
+ {
+ o->error = OPROTO;
+ return 0;
+ }
if (o->direction == ODR_PRINT)
{
int i;
if (o->direction == ODR_PRINT)
{
int i;
@@
-55,6
+68,6
@@
int odr_oid(ODR o, Odr_oid **p, int opt)
return 1;
}
if (o->direction == ODR_DECODE)
return 1;
}
if (o->direction == ODR_DECODE)
- *p = nalloc(o, ODR_OID_SIZE * sizeof(**p));
+ *p = odr_malloc(o, ODR_OID_SIZE * sizeof(**p));
return ber_oidc(o, *p);
}
return ber_oidc(o, *p);
}