Fix null ptr reference for freeReplyObject YAZ-773

[yaz-moved-to-github.git] / src / odr_seq.c

diff --git a/src/odr_seq.c b/src/odr_seq.c
index b73d1fd..137fe34 100644 (file)
--- a/src/odr_seq.c
+++ b/src/odr_seq.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_seq.c,v 1.6 2007-01-03 08:42:15 adam Exp $
  */
 /**
  * \file odr_seq.c
@@ -20,14 +18,14 @@ int odr_sequence_begin(ODR o, void *p, int size, const char *name)
 
     if (o->error)
         return 0;
-    if (o->t_class < 0)
+    if (o->op->t_class < 0)
     {
-        o->t_class = ODR_UNIVERSAL;
-        o->t_tag = ODR_SEQUENCE;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_SEQUENCE;
     }
     if (o->direction == ODR_DECODE)
         *pp = 0;
-    if (odr_constructed_begin(o, p, o->t_class, o->t_tag, name))
+    if (odr_constructed_begin(o, p, o->op->t_class, o->op->t_tag, name))
     {
         if (o->direction == ODR_DECODE && size)
             *pp = (char *)odr_malloc(o, size);
@@ -43,14 +41,14 @@ int odr_set_begin(ODR o, void *p, int size, const char *name)
 
     if (o->error)
         return 0;
-    if (o->t_class < 0)
+    if (o->op->t_class < 0)
     {
-        o->t_class = ODR_UNIVERSAL;
-        o->t_tag = ODR_SET;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_SET;
     }
     if (o->direction == ODR_DECODE)
         *pp = 0;
-    if (odr_constructed_begin(o, p, o->t_class, o->t_tag, name))
+    if (odr_constructed_begin(o, p, o->op->t_class, o->op->t_tag, name))
     {
         if (o->direction == ODR_DECODE && size)
             *pp = (char *)odr_malloc(o, size);
@@ -62,12 +60,12 @@ int odr_set_begin(ODR o, void *p, int size, const char *name)
 
 int odr_sequence_end(ODR o)
 {
-    return odr_constructed_end(o);    
+    return odr_constructed_end(o);
 }
 
 int odr_set_end(ODR o)
 {
-    return odr_constructed_end(o);    
+    return odr_constructed_end(o);
 }
 
 static int odr_sequence_more(ODR o)
@@ -147,6 +145,7 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab