diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-30 02:51:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:49 -0500 |
| commit | 56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382 (patch) | |
| tree | fe800dc017985b616874b79ffad6122a1e5bde34 /source3/registry | |
| parent | be8b0685a55700c6bce3681734800ec6434b0364 (diff) | |
| download | samba-56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382.tar.gz samba-56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382.tar.bz2 samba-56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382.zip | |
r22590: Make TALLOC_ARRAY consistent across all uses.
That should be it....
Jeremy.
(This used to be commit 603233a98bbf65467c8b4f04719d771c70b3b4c9)
Diffstat (limited to 'source3/registry')
| -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 f7ea58f8a3..3a554177a4 100644 --- a/source3/registry/regfio.c +++ b/source3/registry/regfio.c @@ -1823,8 +1823,12 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 ) memcpy( nk->subkeys.header, "lf", REC_HDR_SIZE ); nk->subkeys.num_keys = nk->num_subkeys; - if ( !(nk->subkeys.hashes = TALLOC_ZERO_ARRAY( file->mem_ctx, REGF_HASH_REC, nk->subkeys.num_keys )) ) - return NULL; + if (nk->subkeys.num_keys) { + if ( !(nk->subkeys.hashes = TALLOC_ZERO_ARRAY( file->mem_ctx, REGF_HASH_REC, nk->subkeys.num_keys )) ) + return NULL; + } else { + nk->subkeys.hashes = NULL; + } nk->subkey_index = 0; /* update the max_bytes_subkey{name,classname} fields */ |