diff options
| author | Jeremy Allison <jra@samba.org> | 2004-12-07 18:25:53 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-12-07 18:25:53 +0000 |
| commit | 65b7a21d331b7f0cfbc6bd6545adde00ce2826fa (patch) | |
| tree | fcd3f6d39e40486c4042636106a700b4c263de25 /source/lib/data_blob.c | |
| parent | a411fc03345bf9b152536f0d33b460d5c89c2b30 (diff) | |
| download | samba-65b7a21d331b7f0cfbc6bd6545adde00ce2826fa.tar.gz samba-65b7a21d331b7f0cfbc6bd6545adde00ce2826fa.tar.xz samba-65b7a21d331b7f0cfbc6bd6545adde00ce2826fa.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.
Diffstat (limited to 'source/lib/data_blob.c')
| -rw-r--r-- | source/lib/data_blob.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/lib/data_blob.c b/source/lib/data_blob.c index 83afc591a15..a1c3af2d492 100644 --- a/source/lib/data_blob.c +++ b/source/lib/data_blob.c @@ -47,7 +47,7 @@ DATA_BLOB data_blob(const void *p, size_t length) if (p) { ret.data = smb_xmemdup(p, length); } else { - ret.data = smb_xmalloc(length); + ret.data = SMB_XMALLOC_ARRAY(char, length); } ret.length = length; ret.free = free_data_blob; @@ -67,11 +67,11 @@ DATA_BLOB data_blob_talloc(TALLOC_CTX *mem_ctx, const void *p, size_t length) } if (p) { - ret.data = talloc_memdup(mem_ctx, p, length); + ret.data = TALLOC_MEMDUP(mem_ctx, p, length); if (ret.data == NULL) smb_panic("data_blob_talloc: talloc_memdup failed.\n"); } else { - ret.data = talloc(mem_ctx, length); + ret.data = TALLOC(mem_ctx, length); if (ret.data == NULL) smb_panic("data_blob_talloc: talloc failed.\n"); } |