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/libmsrpc/libmsrpc_internal.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/libmsrpc/libmsrpc_internal.c')
| -rw-r--r-- | source3/libmsrpc/libmsrpc_internal.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source3/libmsrpc/libmsrpc_internal.c b/source3/libmsrpc/libmsrpc_internal.c index 64e6332e80..3cb702e376 100644 --- a/source3/libmsrpc/libmsrpc_internal.c +++ b/source3/libmsrpc/libmsrpc_internal.c @@ -299,12 +299,16 @@ REG_VALUE_DATA *cac_MakeRegValueData( TALLOC_CTX * mem_ctx, uint32 data_type, break; } - strings = TALLOC_ARRAY( mem_ctx, char *, num_strings ); + if (num_strings) { + strings = TALLOC_ARRAY( mem_ctx, char *, num_strings ); - if ( !strings ) { - errno = ENOMEM; - TALLOC_FREE( data ); - break; + if ( !strings ) { + errno = ENOMEM; + TALLOC_FREE( data ); + break; + } + } else { + strings = NULL; } if ( num_strings == 0 ) /*then our work here is done */ |