Merge Anton's 64-bit fix.

Jeremy.
(This used to be commit 0644f6a68e5c1d9a2c236ab0f90d4801848a9b33)

diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c
index a0a3d51139d61aaaaf2d3fbd4145ad31e64163c5..5adde19eea8230995835e2f1dd6771ee5799ba03 100644 (file)
--- a/source3/smbd/mangle_hash2.c
+++ b/source3/smbd/mangle_hash2.c
@@ -147,14 +147,12 @@ static BOOL cache_init(void)
 {
        if (prefix_cache) return True;
 
-       prefix_cache = malloc(sizeof(char *) * MANGLE_CACHE_SIZE);
+       prefix_cache = calloc(MANGLE_CACHE_SIZE, sizeof(char *));
        if (!prefix_cache) return False;
 
-       prefix_cache_hashes = malloc(sizeof(u32) * MANGLE_CACHE_SIZE);
+       prefix_cache_hashes = calloc(MANGLE_CACHE_SIZE, sizeof(u32));
        if (!prefix_cache_hashes) return False;
 
-       memset(prefix_cache, 0, sizeof(char *) * MANGLE_CACHE_SIZE);
-       memset(prefix_cache_hashes, 0, sizeof(char *) * MANGLE_CACHE_SIZE);
        return True;
 }