diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-09-27 01:36:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:20 -0500 |
| commit | 5b44130afad1bb1764d986de3ef0e8e04b0e7357 (patch) | |
| tree | afea820fdfd1021b5ee55b2fa37ba1b32d334e46 /source4/torture | |
| parent | f095a8e748a87de9f4cde117df13e8dccd8aeaa9 (diff) | |
| download | samba-5b44130afad1bb1764d986de3ef0e8e04b0e7357.tar.gz samba-5b44130afad1bb1764d986de3ef0e8e04b0e7357.tar.bz2 samba-5b44130afad1bb1764d986de3ef0e8e04b0e7357.zip | |
r2671: we're getting too many errors caused by the talloc_realloc() API not
taking a context (so when you pass a NULL pointer you end up with
memory in a top level context). Fixed it by changing the API to take a
context. The context is only used if the pointer you are reallocing is
NULL.
(This used to be commit 8dc23821c9f54b2f13049b5e608a0cafb81aa540)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/rap/rap.c | 3 | ||||
| -rw-r--r-- | source4/torture/raw/search.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c index 7dc9e7fcbc..407aadbc0e 100644 --- a/source4/torture/rap/rap.c +++ b/source4/torture/rap/rap.c @@ -79,7 +79,8 @@ static void rap_cli_push_paramdesc(struct rap_call *call, char desc) if (call->paramdesc != NULL) len = strlen(call->paramdesc); - call->paramdesc = talloc_realloc(call->paramdesc, + call->paramdesc = talloc_realloc(call->mem_ctx, + call->paramdesc, len+2); call->paramdesc[len] = desc; call->paramdesc[len+1] = '\0'; diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index d0873e2ef4..e5c682575c 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -410,8 +410,10 @@ static BOOL multiple_search_callback(void *private, union smb_search_data *file) data->count++; - data->list = talloc_realloc(data->list, - data->count * (sizeof(data->list[0]))); + data->list = talloc_realloc_p(data->mem_ctx, + data->list, + union smb_search_data, + data->count); data->list[data->count-1] = *file; |