summaryrefslogtreecommitdiffstats
path: root/source/registry
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-04-30 02:39:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:49 -0500
commit8968808c3b5b0208cbad9ac92eaf948f2c546dd9 (patch)
tree26d539cf26e3ca30d5ead10c6b9257134783024a /source/registry
parent8ad13718af0ba1fcb10a6f1631b1ed3cb8d11175 (diff)
downloadsamba-8968808c3b5b0208cbad9ac92eaf948f2c546dd9.tar.gz
samba-8968808c3b5b0208cbad9ac92eaf948f2c546dd9.tar.xz
samba-8968808c3b5b0208cbad9ac92eaf948f2c546dd9.zip
r22589: Make TALLOC_ARRAY consistent across all uses.
Jeremy.
Diffstat (limited to 'source/registry')
-rw-r--r--source/registry/regfio.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/registry/regfio.c b/source/registry/regfio.c
index f2e95da8898..f7ea58f8a35 100644
--- a/source/registry/regfio.c
+++ b/source/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 */