Removed duplicate variable for turbo marcxml (using_turbo_format). Now works in zooms...

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

diff --git a/src/ber_oid.c b/src/ber_oid.c
index e1947d6..9a96e52 100644 (file)
--- a/src/ber_oid.c
+++ b/src/ber_oid.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_oid.c,v 1.6 2005-05-26 21:46:40 adam Exp $
  */
 
 /** 
@@ -44,8 +42,8 @@ int ber_oidc(ODR o, Odr_oid *p, int max_oid_size)
             return 0;
         }
         pos = 0;
-       while (len)
-       {
+        while (len)
+        {
             int id = 0;
             do
             {
@@ -59,22 +57,33 @@ int ber_oidc(ODR o, Odr_oid *p, int max_oid_size)
                 len--;
             }
             while (*(o->bp++) & 0X80);
+
+            if (id < 0)
+            {
+                odr_seterror(o, ODATA, 23);
+                return 0;
+            }
             if (pos > 0)
                 p[pos++] = id;
-           else
+            else
             {
                 p[0] = id / 40;
-               if (p[0] > 2)
+                if (p[0] > 2)
                     p[0] = 2;
-               p[1] = id - p[0] * 40;
-               pos = 2;
+                p[1] = id - p[0] * 40;
+                pos = 2;
+            }
+            if (pos >= max_oid_size)
+            {
+                odr_seterror(o, OPROTO, 55);
+                return 0;
             }
-           if (pos >= max_oid_size)
-           {
-               odr_seterror(o, OPROTO, 55);
-               return 0;
-           }
-       }
+        }
+        if (pos < 2 || p[0] < 0 || p[1] < 0)
+        {
+            odr_seterror(o, ODATA, 23);
+            return 0;
+        }
         p[pos] = -1;
         return 1;
     case ODR_ENCODE:
@@ -88,12 +97,12 @@ int ber_oidc(ODR o, Odr_oid *p, int max_oid_size)
             odr_seterror(o, ODATA, 23);
             return 0;
         }
-        for (pos = 1; p[pos] >= 0; pos++)
+        for (pos = 1; p[pos] != -1; pos++)
         {
             n = 0;
             if (pos == 1)
                 id = p[0]*40 + p[1];
-           else 
+            else 
                 id = p[pos];
             do
             {
@@ -124,3 +133,12 @@ int ber_oidc(ODR o, Odr_oid *p, int max_oid_size)
         return 0;
     }
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+