X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_null.c;h=d9ed423719714fa50cd15bafa7ce1628f0212448;hp=2db79527212103179937a513e0e83c8177a3d029;hb=d32b1dbdc1f0392883547cc9e56c26f384a4c57f;hpb=10981b2f116449523a9f628c20a78212ce91553e

diff --git a/odr/odr_null.c b/odr/odr_null.c
index 2db7952..d9ed423 100644
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_null.c,v $
- * Revision 1.2  1995-02-09 15:51:49  quinn
+ * 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
  * Works better now.
  *
  * Revision 1.1  1995/02/02  16:21:54  quinn
@@ -23,27 +29,27 @@ 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 (o->direction == ODR_DECODE)
-    	*p =0;
-    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)
-    {
-    	*p = 0;
     	return opt;
-    }
     if (o->direction == ODR_PRINT)
     {
     	fprintf(o->print, "%sNULL\n", odr_indent(o));
     	return 1;
     }
     if (cons)
+    {
+    	o->error = OPROTO;
     	return 0;
+    }
     if (o->direction == ODR_DECODE)
     	*p = &nullval;
     return ber_null(o, *p);