Changeset 740 for vendor/current/lib/util/idtree.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/lib/util/idtree.c (modified) (3 diffs)

vendor/current/lib/util/idtree.c

@@ -105 +105 @@
         int n, m, sh;
         struct idr_layer *p, *pn;
-        struct idr_layer *pa[MAX_LEVEL];
-        int l, id, oid;
+        struct idr_layer *pa[MAX_LEVEL+1];
+        unsigned int l, id, oid;
         uint32_t bm;
 
@@ -241 +241 @@
 {
         struct idr_layer *p = idp->top;
-        struct idr_layer **pa[MAX_LEVEL];
+        struct idr_layer **pa[1+MAX_LEVEL];
         struct idr_layer ***paa = &pa[0];
         int n;
@@ -281 +281 @@
          * present.  If so, tain't one of ours!
          */
-        if ((id & ~(~0 << MAX_ID_SHIFT)) >> (n + IDR_BITS))
-             return NULL;
+        if (n + IDR_BITS < 31 &&
+            ((id & ~(~0 << MAX_ID_SHIFT)) >> (n + IDR_BITS))) {
+                return NULL;
+        }
 
         /* Mask off upper bits we don't use for the search. */