X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_null.c;h=35279c7ed6b9eb3ffc4a3714d35f2508e1e6de59;hb=99268f722648e84bf5c54eb685a1434e100f38a1;hp=a80a2ac98d70551e07d632c39d06fe841603e725;hpb=6d0cb38e2fd32c722b0af63ce050ac5c458d849f;p=yaz-moved-to-github.git

diff --git a/odr/odr_null.c b/odr/odr_null.c
index a80a2ac..35279c7 100644
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -1,10 +1,16 @@
 /*
- * 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_null.c,v $
- * Revision 1.3  1995-02-10 18:57:25  quinn
+ * Revision 1.5  1995-05-16 08:50:56  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/03/08  12:12:26  quinn
+ * Added better error checking.
+ *
+ * Revision 1.3  1995/02/10  18:57:25  quinn
  * More in the way of error-checking.
  *
  * Revision 1.2  1995/02/09  15:51:49  quinn
@@ -26,12 +32,14 @@ int odr_null(ODR o, int **p, int opt)
     int res, cons = 0;
     static int nullval = 0;
 
+    if (o->error)
+    	return 0;
     if (o->t_class < 0)
     {
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_NULL;
     }
-    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;
@@ -41,7 +49,10 @@ int odr_null(ODR o, int **p, int opt)
     	return 1;
     }
     if (cons)
+    {
+    	o->error = OPROTO;
     	return 0;
+    }
     if (o->direction == ODR_DECODE)
     	*p = &nullval;
     return ber_null(o, *p);