Changeset 988 for vendor/current/lib/util/bitmap.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/lib/util/bitmap.c (modified) (2 diffs)

vendor/current/lib/util/bitmap.c

@@ -21 +21 @@
 #include "lib/util/bitmap.h"
 
+struct bitmap {
+        unsigned int n;
+        uint32_t b[1];          /* We allocate more */
+};
+
 /* these functions provide a simple way to allocate integers from a
    pool without repetition */
@@ -31 +36 @@
         struct bitmap *bm;
 
-        bm = talloc_zero(mem_ctx, struct bitmap);
+        bm = (struct bitmap *)talloc_zero_size(
+                mem_ctx,
+                offsetof(struct bitmap, b) + sizeof(uint32_t)*((n+31)/32));
 
         if (!bm) return NULL;
 
+        talloc_set_name_const(bm, "struct bitmap");
+
         bm->n = n;
-        bm->b = talloc_zero_array(bm, uint32_t, (n+31)/32);
-        if (!bm->b) {
-                TALLOC_FREE(bm);
-                return NULL;
-        }
         return bm;
 }