sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-21 01:59:07 +03:00
Code

r14766: Fix possible NULL deref. Coverity #254.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 2006-03-29 22:45:52 +00:00 committed by Gerald (Jerry) Carter
parent 7a18f38947
commit e2e2d8b939
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/registry/reg_objects.c
View File

@ -43,8 +43,6 @@
int regsubkey_ctr_addkey( REGSUBKEY_CTR *ctr, const char *keyname ) int regsubkey_ctr_addkey( REGSUBKEY_CTR *ctr, const char *keyname )
{ {
char **pp;
if ( !keyname ) if ( !keyname )
return ctr->num_subkeys; return ctr->num_subkeys;
@ -55,12 +53,15 @@ int regsubkey_ctr_addkey( REGSUBKEY_CTR *ctr, const char *keyname )
/* allocate a space for the char* in the array */ /* allocate a space for the char* in the array */
if ( ctr->subkeys == 0 ) if (ctr->subkeys == NULL) {
ctr->subkeys = TALLOC_P( ctr, char *); ctr->subkeys = TALLOC_P(ctr, char *);
else { } else {
pp = TALLOC_REALLOC_ARRAY( ctr, ctr->subkeys, char *, ctr->num_subkeys+1); ctr->subkeys = TALLOC_REALLOC_ARRAY(ctr, ctr->subkeys, char *, ctr->num_subkeys+1);
if ( pp ) }
ctr->subkeys = pp;
if (!ctr->subkeys) {
ctr->num_subkeys = 0;
return 0;
} }
/* allocate the string and save it in the array */ /* allocate the string and save it in the array */