diff options
| author | Jeremy Allison <jra@samba.org> | 2006-12-16 05:02:21 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2006-12-16 05:02:21 +0000 |
| commit | 474833ac5eb4a43e94e32bf50ba649805304a258 (patch) | |
| tree | 71f6e4749bb0749624fbe4e8acf90aa034895047 /source/lib/util_str.c | |
| parent | 84fa20bc1bea33425b06dbc43ca456bb945bf3a8 (diff) | |
| download | samba-474833ac5eb4a43e94e32bf50ba649805304a258.tar.gz samba-474833ac5eb4a43e94e32bf50ba649805304a258.tar.xz samba-474833ac5eb4a43e94e32bf50ba649805304a258.zip | |
r20208: Change sprintf_append() never to use malloc,
but always use a talloc context.
Thanks to simo for pointing this out.
Jeremy.
Diffstat (limited to 'source/lib/util_str.c')
| -rw-r--r-- | source/lib/util_str.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/source/lib/util_str.c b/source/lib/util_str.c index cd52faa52d9..ccf0af8b623 100644 --- a/source/lib/util_str.c +++ b/source/lib/util_str.c @@ -2458,11 +2458,7 @@ void sprintf_append(TALLOC_CTX *mem_ctx, char **string, ssize_t *len, if (*bufsize == 0) *bufsize = 128; - if (mem_ctx != NULL) - *string = TALLOC_ARRAY(mem_ctx, char, *bufsize); - else - *string = SMB_MALLOC_ARRAY(char, *bufsize); - + *string = TALLOC_ARRAY(mem_ctx, char, *bufsize); if (*string == NULL) goto error; } @@ -2484,13 +2480,8 @@ void sprintf_append(TALLOC_CTX *mem_ctx, char **string, ssize_t *len, } if (increased) { - if (mem_ctx != NULL) { - *string = TALLOC_REALLOC_ARRAY(mem_ctx, *string, char, - *bufsize); - } else { - *string = SMB_REALLOC_ARRAY(*string, char, *bufsize); - } - + *string = TALLOC_REALLOC_ARRAY(mem_ctx, *string, char, + *bufsize); if (*string == NULL) { goto error; } @@ -2503,9 +2494,6 @@ void sprintf_append(TALLOC_CTX *mem_ctx, char **string, ssize_t *len, error: *len = -1; - if (mem_ctx == NULL) { - SAFE_FREE(*string); - } *string = NULL; } |