X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fber_oid.c;h=ed05298ca4d1c4d859086d0570a44e9c4d6a8528;hb=a1f888c8d35ebce2c0b3a6be4e7dc4f7d9dfcf63;hp=eba9ce6d0952b2b485eeae3584e27a55f349416d;hpb=05c274ef315384faafcc5900c17468f0ea2474e6;p=yaz-moved-to-github.git

diff --git a/src/ber_oid.c b/src/ber_oid.c
index eba9ce6..ed05298 100644
--- a/src/ber_oid.c
+++ b/src/ber_oid.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1995-2004, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: ber_oid.c,v 1.4 2004-10-15 00:18:59 adam Exp $
+ * $Id: ber_oid.c,v 1.8 2006-04-17 07:40:15 adam Exp $
  */
 
 /** 
@@ -18,7 +18,7 @@
 
 #include "odr-priv.h"
 
-int ber_oidc(ODR o, Odr_oid *p)
+int ber_oidc(ODR o, Odr_oid *p, int max_oid_size)
 {
     int len, lenp, end;
     int pos, n, res, id;
@@ -32,7 +32,7 @@ int ber_oidc(ODR o, Odr_oid *p)
             odr_seterror(o, OPROTO, 18);
             return 0;
         }
-        if (len <= 0)
+        if (len < 0)
         {
             odr_seterror(o, OPROTO, 19);
             return 0;
@@ -44,8 +44,8 @@ int ber_oidc(ODR o, Odr_oid *p)
             return 0;
         }
         pos = 0;
-	while (len)
-	{
+        while (len)
+        {
             int id = 0;
             do
             {
@@ -59,17 +59,33 @@ int ber_oidc(ODR o, Odr_oid *p)
                 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 < 2 || p[0] < 0 || p[1] < 0)
+        {
+            odr_seterror(o, ODATA, 23);
+            return 0;
+        }
         p[pos] = -1;
         return 1;
     case ODR_ENCODE:
@@ -83,12 +99,12 @@ int ber_oidc(ODR o, Odr_oid *p)
             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
             {
@@ -119,3 +135,11 @@ int ber_oidc(ODR o, Odr_oid *p)
         return 0;
     }
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+