Fixed possible buf in proto.c

[yaz-moved-to-github.git] / odr / odr_null.c

diff --git a/odr/odr_null.c b/odr/odr_null.c
index a80a2ac..d9ed423 100644 (file)
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_null.c,v $
- * Revision 1.3  1995-02-10 18:57:25  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
@@ -26,12 +29,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 +46,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);