X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oid.c;h=633101b242c82165c344206aca45e6fa8a0200f2;hb=5227c7d54c015a1fda5d5b848445fb0343554b61;hp=9dce6b01edc7c456c2811155a32886aa3330ee11;hpb=1b06a5c10770ef964044f824a33d4cc8652d8e7a;p=yaz-moved-to-github.git

diff --git a/odr/odr_oid.c b/odr/odr_oid.c
index 9dce6b0..633101b 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.4  1995-02-10 15:55:29  quinn
+ * 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
  * Bug fixes, mostly.
  *
  * Revision 1.3  1995/02/09  15:51:49  quinn
@@ -29,22 +38,21 @@ 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 (o->direction == ODR_DECODE)
-    	*p =0;
-    if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
-    {
-    	*p = 0;
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
     	return 0;
-    }
-    if (!res || cons)
-    {
-    	*p = 0;
+    if (!res)
     	return opt;
+    if (cons)
+    {
+    	o->error = OPROTO;
+	return 0;
     }
     if (o->direction == ODR_PRINT)
     {
@@ -58,5 +66,5 @@ int odr_oid(ODR o, Odr_oid **p, int opt)
     }
     if (o->direction == ODR_DECODE)
     	*p = nalloc(o, ODR_OID_SIZE * sizeof(**p));
-    return ber_oid(o, *p);
+    return ber_oidc(o, *p);
 }