X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oid.c;h=f6d005de22e34e23ea31c9491dd6c9ad1f6becab;hb=f305305306da9af74ed6c559f2b06353fd5a7c82;hp=641e117da15595211734669d47c7e5894ac8d3fd;hpb=04cde6d037338d3128c77698d4c8a7f03010db1e;p=yaz-moved-to-github.git

diff --git a/odr/odr_oid.c b/odr/odr_oid.c
index 641e117..f6d005d 100644
--- a/odr/odr_oid.c
+++ b/odr/odr_oid.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oid.c,v $
- * Revision 1.6  1995-03-01 08:40:56  quinn
+ * Revision 1.10  1995-05-29 08:11:44  quinn
+ * Moved oid from odr/asn to util.
+ *
+ * Revision 1.9  1995/05/16  08:50:57  quinn
+ * License, documentation, and memory fixes
+ *
+ * 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
@@ -26,6 +38,7 @@
  */
 
 #include <odr.h>
+#include <oid.h>
 
 /*
  * Top level oid en/decoder.
@@ -35,15 +48,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;
@@ -55,6 +75,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));
+    	*p = odr_malloc(o, OID_SIZE * sizeof(**p));
     return ber_oidc(o, *p);
 }