diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-30 02:39:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:49 -0500 |
| commit | be8b0685a55700c6bce3681734800ec6434b0364 (patch) | |
| tree | 8616d85686fb147d431eeea435233f45d5ee8d41 /source3/registry/regfio.c | |
| parent | 79de0ad9463a5cd64978beae37df79fbb4f74632 (diff) | |
| download | samba-be8b0685a55700c6bce3681734800ec6434b0364.tar.gz samba-be8b0685a55700c6bce3681734800ec6434b0364.tar.bz2 samba-be8b0685a55700c6bce3681734800ec6434b0364.zip | |
r22589: Make TALLOC_ARRAY consistent across all uses.
Jeremy.
(This used to be commit 8968808c3b5b0208cbad9ac92eaf948f2c546dd9)
Diffstat (limited to 'source3/registry/regfio.c')
| -rw-r--r-- | source3/registry/regfio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c index f2e95da889..f7ea58f8a3 100644 --- a/source3/registry/regfio.c +++ b/source3/registry/regfio.c @@ -1847,8 +1847,12 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 ) } nk->values_off = prs_offset( &vlist_hbin->ps ) + vlist_hbin->first_hbin_off - HBIN_HDR_SIZE; - if ( !(nk->values = TALLOC_ARRAY( file->mem_ctx, REGF_VK_REC, nk->num_values )) ) - return NULL; + if (nk->num_values) { + if ( !(nk->values = TALLOC_ARRAY( file->mem_ctx, REGF_VK_REC, nk->num_values )) ) + return NULL; + } else { + nk->values = NULL; + } /* create the vk records */ |