diff options
| author | Jeremy Allison <jra@samba.org> | 2004-12-07 18:25:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:32 -0500 |
| commit | acf9d61421faa6c0055d57fdee7db300dc5431aa (patch) | |
| tree | 5482afecfe9b4a68b9a1f18d541a3109f8143ab7 /source3/lib/system.c | |
| parent | 3bd3be97dc8a581c0502410453091c195e322766 (diff) | |
| download | samba-acf9d61421faa6c0055d57fdee7db300dc5431aa.tar.gz samba-acf9d61421faa6c0055d57fdee7db300dc5431aa.tar.bz2 samba-acf9d61421faa6c0055d57fdee7db300dc5431aa.zip | |
r4088: Get medieval on our ass about malloc.... :-). Take control of all our allocation
functions so we can funnel through some well known functions. Should help greatly with
malloc checking.
HEAD patch to follow.
Jeremy.
(This used to be commit 620f2e608f70ba92f032720c031283d295c5c06a)
Diffstat (limited to 'source3/lib/system.c')
| -rw-r--r-- | source3/lib/system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/system.c b/source3/lib/system.c index f33d1ae7d5..7434cbe35e 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -1096,7 +1096,7 @@ static char **extract_args(const char *command) for( argcl = 1; ptr; ptr = strtok(NULL, " \t")) argcl++; - if((argl = (char **)malloc((argcl + 1) * sizeof(char *))) == NULL) + if((argl = (char **)SMB_MALLOC((argcl + 1) * sizeof(char *))) == NULL) return NULL; /* @@ -1178,7 +1178,7 @@ int sys_popen(const char *command) goto err_exit; } - if((entry = (popen_list *)malloc(sizeof(popen_list))) == NULL) + if((entry = SMB_MALLOC_P(popen_list)) == NULL) goto err_exit; ZERO_STRUCTP(entry); |