X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oid.c;h=d12226fafe1befd04a949526d552236916590598;hb=7d093cf64e6045cf14dbf199f8cdf6b808dd3b65;hp=374092a65f8f27caaa4edc1a03a59df77b7d691a;hpb=6d0cb38e2fd32c722b0af63ce050ac5c458d849f;p=yaz-moved-to-github.git

diff --git a/odr/odr_oid.c b/odr/odr_oid.c
index 374092a..d12226f 100644
--- a/odr/odr_oid.c
+++ b/odr/odr_oid.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oid.c,v $
- * Revision 1.5  1995-02-10 18:57:26  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
  * More in the way of error-checking.
  *
  * Revision 1.4  1995/02/10  15:55:29  quinn
@@ -32,15 +41,22 @@ int odr_oid(ODR o, Odr_oid **p, int opt)
 {
     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 ((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 || cons)
+    if (!res)
     	return opt;
+    if (cons)
+    {
+    	o->error = OPROTO;
+	return 0;
+    }
     if (o->direction == ODR_PRINT)
     {
     	int i;
@@ -52,6 +68,6 @@ int odr_oid(ODR o, Odr_oid **p, int opt)
     	return 1;
     }
     if (o->direction == ODR_DECODE)
-    	*p = nalloc(o, ODR_OID_SIZE * sizeof(**p));
-    return ber_oid(o, *p);
+    	*p = odr_malloc(o, ODR_OID_SIZE * sizeof(**p));
+    return ber_oidc(o, *p);
 }