r4120: Never, ever, doubt valgrind :-). Fix order of evaluation bug that's been in the

bitmap code for ever. Remove silly extra space in paranoid malloc.
Jeremy.
(This used to be commit 0a7d17bc9b178628da371e627014412e9bef5d42)

2 files changed, 6 insertions, 12 deletions

diff --git a/source3/lib/bitmap.c b/source3/lib/bitmap.c
index a6b52efe09..f2442d2add 100644
--- a/source3/lib/bitmap.c
+++ b/source3/lib/bitmap.c
@@ -41,7 +41,7 @@ struct bitmap *bitmap_allocate(int n)
 		return NULL;
 	}
 
-	memset(bm->b, 0, sizeof(bm->b[0])*(n+31)/32);
+	memset(bm->b, 0, sizeof(uint32)*((n+31)/32));
 
 	return bm;
 }
@@ -78,7 +78,7 @@ struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n)
 		return NULL;
 	}
 
-	memset(bm->b, 0, sizeof(bm->b[0])*(n+31)/32);
+	memset(bm->b, 0, sizeof(uint32)*((n+31)/32));
 
 	return bm;
 }
@@ -92,7 +92,7 @@ int bitmap_copy(struct bitmap * const dst, const struct bitmap * const src)
         int count = MIN(dst->n, src->n);
 
         SMB_ASSERT(dst->b != src->b);
-	memcpy(dst->b, src->b, sizeof(dst->b[0])*(count+31)/32);
+	memcpy(dst->b, src->b, sizeof(uint32)*((count+31)/32));
 
         return count;
 }
diff --git a/source3/lib/util.c b/source3/lib/util.c
index ce8495e82e..4d66ed9655 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -867,9 +867,7 @@ BOOL yesno(char *p)
 void *malloc_(size_t size)
 {
 #undef malloc
-	/* If we don't add an amount here the glibc memset seems to write
-	   one byte over. */
-	return malloc(size+16);
+	return malloc(size);
 #define malloc(s) __ERROR_DONT_USE_MALLOC_DIRECTLY
 }
 
@@ -880,9 +878,7 @@ void *malloc_(size_t size)
 static void *calloc_(size_t count, size_t size)
 {
 #undef calloc
-	/* If we don't add an amount here the glibc memset seems to write
-	   one byte over. */
-	return calloc(count+1, size);
+	return calloc(count, size);
 #define calloc(n,s) __ERROR_DONT_USE_CALLOC_DIRECTLY
 }
 
@@ -893,9 +889,7 @@ static void *calloc_(size_t count, size_t size)
 static void *realloc_(void *ptr, size_t size)
 {
 #undef realloc
-	/* If we don't add an amount here the glibc memset seems to write
-	   one byte over. */
-	return realloc(ptr, size+16);
+	return realloc(ptr, size);
 #define realloc(p,s) __ERROR_DONT_USE_RELLOC_DIRECTLY
 }