fixed seg fault in registry frontend caused by trying to

use a destroyed TALLOC_CTX*
(This used to be commit 432b9f8d7c20fbf3b2a0906c8a93272abbe43fb6)

3 files changed, 21 insertions, 12 deletions

diff --git a/source3/registry/reg_cachehook.c b/source3/registry/reg_cachehook.c
index 346ba20eb7..e2444d8d17 100644
--- a/source3/registry/reg_cachehook.c
+++ b/source3/registry/reg_cachehook.c
@@ -69,15 +69,20 @@ BOOL reghook_cache_add( REGISTRY_HOOK *hook )
 REGISTRY_HOOK* reghook_cache_find( char *keyname )
 {
 	char *key;
+	int len;
 	
 	if ( !keyname )
 		return NULL;
-		
-	if ( (key = strdup( keyname )) == NULL ) {
-		DEBUG(0,("reghook_cache_find: strdup() failed for string [%s] !?!?!\n",
+	
+	len = strlen( keyname );
+	if ( !(key = malloc( len + 2 )) ) {
+		DEBUG(0,("reghook_cache_find: malloc failed for string [%s] !?!?!\n",
 			keyname));
 		return NULL;
 	}
+
+	*key = '\\';
+	strncpy( key+1, keyname, len+1);
 	
 	string_sub( key, "\\", "/", 0 );
 		
diff --git a/source3/registry/reg_db.c b/source3/registry/reg_db.c
index d44a8d004c..fb6ebdbf7c 100644
--- a/source3/registry/reg_db.c
+++ b/source3/registry/reg_db.c
@@ -43,12 +43,14 @@ static BOOL init_registry_data( void )
 
 	/* HKEY_LOCAL_MACHINE */
 	
+	regsubkey_ctr_init( &subkeys );
 	pstrcpy( keyname, KEY_HKLM );
 	regsubkey_ctr_addkey( &subkeys, "SYSTEM" );
 	if ( !regdb_store_reg_keys( keyname, &subkeys ))
 		return False;
 	regsubkey_ctr_destroy( &subkeys );
 		
+	regsubkey_ctr_init( &subkeys );
 	pstrcpy( keyname, KEY_HKLM );
 	pstrcat( keyname, "/SYSTEM" );
 	regsubkey_ctr_addkey( &subkeys, "CurrentControlSet" );
@@ -56,6 +58,7 @@ static BOOL init_registry_data( void )
 		return False;
 	regsubkey_ctr_destroy( &subkeys );
 		
+	regsubkey_ctr_init( &subkeys );
 	pstrcpy( keyname, KEY_HKLM );
 	pstrcat( keyname, "/SYSTEM/CurrentControlSet" );
 	regsubkey_ctr_addkey( &subkeys, "Control" );
@@ -64,6 +67,7 @@ static BOOL init_registry_data( void )
 		return False;
 	regsubkey_ctr_destroy( &subkeys );
 
+	regsubkey_ctr_init( &subkeys );
 	pstrcpy( keyname, KEY_HKLM );
 	pstrcat( keyname, "/SYSTEM/CurrentControlSet/Control" );
 	regsubkey_ctr_addkey( &subkeys, "Print" );
@@ -77,6 +81,7 @@ static BOOL init_registry_data( void )
 	if ( !regdb_store_reg_keys( keyname, &subkeys ))
 		return False;
 
+	regsubkey_ctr_init( &subkeys );
 	pstrcpy( keyname, KEY_HKLM );
 	pstrcat( keyname, "/SYSTEM/CurrentControlSet/services" );
 	regsubkey_ctr_addkey( &subkeys, "Netlogon" );
@@ -84,6 +89,7 @@ static BOOL init_registry_data( void )
 		return False;
 	regsubkey_ctr_destroy( &subkeys );
 		
+	regsubkey_ctr_init( &subkeys );
 	pstrcpy( keyname, KEY_HKLM );
 	pstrcat( keyname, "/SYSTEM/CurrentControlSet/services/Netlogon" );
 	regsubkey_ctr_addkey( &subkeys, "parameters" );
diff --git a/source3/registry/reg_frontend.c b/source3/registry/reg_frontend.c
index 3e3ec49425..6090245096 100644
--- a/source3/registry/reg_frontend.c
+++ b/source3/registry/reg_frontend.c
@@ -248,11 +248,10 @@ char* regsubkey_ctr_specific_key( REGSUBKEY_CTR *ctr, uint32 key_index )
 
 void regsubkey_ctr_destroy( REGSUBKEY_CTR *ctr )
 {
-	if ( ctr )
-		talloc_destroy( ctr->ctx );
-		
-	ctr->num_subkeys  = 0;
-	ctr->subkeys      = NULL;
+	if ( ctr ) {
+		talloc_destroy( ctr->ctx );	
+		ZERO_STRUCTP( ctr );
+	}
 }
 
 
@@ -285,10 +284,9 @@ int regval_ctr_numvals( REGVAL_CTR *ctr )
 
 void regval_ctr_destroy( REGVAL_CTR *ctr )
 {
-	if ( ctr )
+	if ( ctr ) {
 		talloc_destroy( ctr->ctx );
-		
-	ctr->num_values  = 0;
-	ctr->values      = NULL;
+		ZERO_STRUCTP( ctr );
+	}
 }