r6640: Attempt to fix 'make everything' with the paranoid malloc checker.

Volker
(This used to be commit 3db2799822da3711b47b60ba13daa07205ced45f)

7 files changed, 23 insertions, 18 deletions

diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index f8eb56c50a..132e0776ab 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -284,7 +284,7 @@ static NTSTATUS cmd_open(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
-	vfs->files[fd] = (struct files_struct *)malloc(sizeof(struct files_struct));
+	vfs->files[fd] = SMB_MALLOC_P(struct files_struct);
 	vfs->files[fd]->fsp_name = SMB_STRDUP(argv[1]);
 	vfs->files[fd]->fd = fd;
 	vfs->files[fd]->conn = vfs->conn;
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index 86379bf3b6..cdeebf2f8e 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -423,7 +423,7 @@ static void test_locks(char *share[NSERVERS])
 	ZERO_STRUCT(fnum);
 	ZERO_STRUCT(cli);
 
-	recorded = (struct record *)malloc(sizeof(*recorded) * numops);
+	recorded = SMB_MALLOC_ARRAY(struct record, numops);
 
 	for (n=0; n<numops; n++) {
 #if PRESETS
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 5fbaf9ec58..45c0890dc3 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -373,7 +373,7 @@ static void test_locks(char *share1, char *share2, char *nfspath1, char *nfspath
 	ZERO_STRUCT(fnum);
 	ZERO_STRUCT(cli);
 
-	recorded = (struct record *)malloc(sizeof(*recorded) * numops);
+	recorded = SMB_MALLOC_ARRAY(struct record, numops);
 
 	for (n=0; n<numops; n++) {
 		recorded[n].conn = random() % NCONNECTIONS;
diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c
index e6a87e68ad..4d61fa0531 100644
--- a/source3/torture/nbio.c
+++ b/source3/torture/nbio.c
@@ -281,7 +281,7 @@ static void delete_fn(const char *mnt, file_info *finfo, const char *name, void
 	char *s, *n;
 	if (finfo->name[0] == '.') return;
 
-	n = strdup(name);
+	n = SMB_STRDUP(name);
 	n[strlen(n)-1] = 0;
 	asprintf(&s, "%s%s", n, finfo->name);
 	if (finfo->mode & aDIR) {
diff --git a/source3/torture/nsstest.c b/source3/torture/nsstest.c
index a803cd7e71..585a592bdc 100644
--- a/source3/torture/nsstest.c
+++ b/source3/torture/nsstest.c
@@ -167,13 +167,13 @@ static struct group *nss_getgrent(void)
 		return NULL;
 
 	if (!buf) 
-		buf = malloc(buflen);
+		buf = SMB_MALLOC(buflen);
 
 again:	
 	status = _nss_getgrent_r(&grp, buf, buflen, &nss_errno);
 	if (status == NSS_STATUS_TRYAGAIN) {
 		buflen *= 2;
-		buf = realloc(buf, buflen);
+		buf = SMB_REALLOC(buf, buflen);
 		goto again;
 	}
 	if (status == NSS_STATUS_NOTFOUND) {
@@ -199,12 +199,12 @@ static struct group *nss_getgrnam(const char *name)
 		return NULL;
 
 	if (!buf) 
-		buf = malloc(buflen);
+		buf = SMB_MALLOC(buflen);
 again:	
 	status = _nss_getgrnam_r(name, &grp, buf, buflen, &nss_errno);
 	if (status == NSS_STATUS_TRYAGAIN) {
 		buflen *= 2;
-		buf = realloc(buf, buflen);
+		buf = SMB_REALLOC(buf, buflen);
 		goto again;
 	}
 	if (status == NSS_STATUS_NOTFOUND) {
@@ -230,13 +230,13 @@ static struct group *nss_getgrgid(gid_t gid)
 		return NULL;
 
 	if (!buf) 
-		buf = malloc(buflen);
+		buf = SMB_MALLOC(buflen);
 
 again:	
 	status = _nss_getgrgid_r(gid, &grp, buf, buflen, &nss_errno);
 	if (status == NSS_STATUS_TRYAGAIN) {
 		buflen *= 2;
-		buf = realloc(buf, buflen);
+		buf = SMB_REALLOC(buf, buflen);
 		goto again;
 	}
 	if (status == NSS_STATUS_NOTFOUND) {
@@ -333,7 +333,7 @@ static void nss_test_initgroups(char *name, gid_t gid)
 	int i;
 	NSS_STATUS status;
 
-	groups = (gid_t *)malloc(size * sizeof(gid_t));
+	groups = SMB_MALLOC_ARRAY(gid_t, size);
 	groups[0] = gid;
 
 	status = nss_initgroups(name, gid, &groups, &start, &size);
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 3296a66096..69acd01c1a 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -52,10 +52,10 @@ static char **completion_fn(char *text, int start, int end)
 	if (!commands) 
 		return NULL;
 
-	matches = (char **)malloc(sizeof(matches[0])*MAX_COMPLETIONS);
+	matches = SMB_MALLOC_ARRAY(char *, MAX_COMPLETIONS);
 	if (!matches) return NULL;
 
-	matches[count++] = strdup(text);
+	matches[count++] = SMB_STRDUP(text);
 	if (!matches[0]) return NULL;
 
 	while (commands && count < MAX_COMPLETIONS-1) 
@@ -68,7 +68,7 @@ static char **completion_fn(char *text, int start, int end)
 			if ((strncmp(text, commands->cmd_set[i].name, strlen(text)) == 0) &&
 				commands->cmd_set[i].fn) 
 			{
-				matches[count] = strdup(commands->cmd_set[i].name);
+				matches[count] = SMB_STRDUP(commands->cmd_set[i].name);
 				if (!matches[count]) 
 					return NULL;
 				count++;
@@ -81,7 +81,7 @@ static char **completion_fn(char *text, int start, int end)
 
 	if (count == 2) {
 		SAFE_FREE(matches[0]);
-		matches[0] = strdup(matches[1]);
+		matches[0] = SMB_STRDUP(matches[1]);
 	}
 	matches[count] = NULL;
 	return matches;
@@ -248,7 +248,7 @@ static void add_command_set(struct cmd_set *cmd_set)
 {
 	struct cmd_list *entry;
 
-	if (!(entry = (struct cmd_list *)malloc(sizeof(struct cmd_list)))) {
+	if (!(entry = SMB_MALLOC_P(struct cmd_list))) {
 		DEBUG(0, ("out of memory\n"));
 		return;
 	}
@@ -274,7 +274,7 @@ static NTSTATUS do_cmd(struct vfs_state *vfs, struct cmd_set *cmd_entry, char *c
  again:
 	while(next_token(&p, buf, " ", sizeof(buf))) {
 		if (argv) {
-			argv[argc] = strdup(buf);
+			argv[argc] = SMB_STRDUP(buf);
 		}
 		
 		argc++;
@@ -284,7 +284,7 @@ static NTSTATUS do_cmd(struct vfs_state *vfs, struct cmd_set *cmd_entry, char *c
 
 		/* Create argument list */
 
-		argv = (char **)malloc(sizeof(char *) * argc);
+		argv = SMB_MALLOC_ARRAY(char *, argc);
 		memset(argv, 0, sizeof(char *) * argc);
 
 		if (!argv) {
diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 4804b99338..d07dc2a211 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -29,6 +29,11 @@
 */
 
 #include "includes.h"
+
+/* We don't care about the paranoid malloc checker in this standalone
+   program */
+#undef malloc
+
 #include <assert.h>
 
 int quiet = 0;