Fix crash in record conv rule select YAZ-812

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

diff --git a/src/odr_oid.c b/src/odr_oid.c
index 5b579cc..7834619 100644 (file)
--- a/src/odr_oid.c
+++ b/src/odr_oid.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_oid.c,v 1.6 2005-05-26 21:46:40 adam Exp $
  */
 /**
  * \file odr_oid.c
@@ -12,8 +10,8 @@
 #include <config.h>
 #endif
 
+#include <yaz/oid_util.h>
 #include "odr-priv.h"
-#include <yaz/oid.h>
 
 /*
  * Top level oid en/decoder.
@@ -24,33 +22,43 @@ int odr_oid(ODR o, Odr_oid **p, int opt, const char *name)
     int res, cons = 0;
 
     if (o->error)
-       return 0;
-    if (o->t_class < 0)
+        return 0;
+    if (o->op->t_class < 0)
     {
-       o->t_class = ODR_UNIVERSAL;
-       o->t_tag = ODR_OID;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_OID;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
-       return 0;
+    res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+    if (res < 0)
+        return 0;
     if (!res)
-       return odr_missing(o, opt, name);
+        return odr_missing(o, opt, name);
     if (cons)
     {
         odr_seterror(o, OPROTO, 46);
-       return 0;
+        return 0;
     }
     if (o->direction == ODR_PRINT)
     {
-       int i;
+        int i;
 
-       odr_prname(o, name);
-       odr_printf(o, "OID:");
-       for (i = 0; (*p)[i] > -1; i++)
-           odr_printf(o, " %d", (*p)[i]);
-       odr_printf(o, "\n");
-       return 1;
+        odr_prname(o, name);
+        odr_printf(o, "OID:");
+        for (i = 0; (*p)[i] > -1; i++)
+            odr_printf(o, " %d", (*p)[i]);
+        odr_printf(o, "\n");
+        return 1;
     }
     if (o->direction == ODR_DECODE)
-       *p = (int *)odr_malloc(o, OID_SIZE * sizeof(**p));
+        *p = (Odr_oid *)odr_malloc(o, OID_SIZE * sizeof(**p));
     return ber_oidc(o, *p, OID_SIZE);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+