svn commit: samba r17878 - in branches: SAMBA_3_0/source/registry SAMBA_3_0_23/source/registry

[jra at samba.org]

Author: jra
Date: 2006-08-28 05:35:27 +0000 (Mon, 28 Aug 2006)
New Revision: 17878

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17878

Log:
Fix possible null deref found by Stanford checker.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/registry/reg_objects.c
   branches/SAMBA_3_0_23/source/registry/reg_objects.c


Changeset:
Modified: branches/SAMBA_3_0/source/registry/reg_objects.c
===================================================================
--- branches/SAMBA_3_0/source/registry/reg_objects.c	2006-08-28 05:27:30 UTC (rev 17877)
+++ branches/SAMBA_3_0/source/registry/reg_objects.c	2006-08-28 05:35:27 UTC (rev 17878)
@@ -109,6 +109,10 @@
 {
 	int 	i;
 	
+	if (!ctr->subkeys) {
+		return False;
+	}
+
 	for ( i=0; i<ctr->num_subkeys; i++ ) {
 		if ( strequal( ctr->subkeys[i],keyname ) )
 			return True;

Modified: branches/SAMBA_3_0_23/source/registry/reg_objects.c
===================================================================
--- branches/SAMBA_3_0_23/source/registry/reg_objects.c	2006-08-28 05:27:30 UTC (rev 17877)
+++ branches/SAMBA_3_0_23/source/registry/reg_objects.c	2006-08-28 05:35:27 UTC (rev 17878)
@@ -109,6 +109,10 @@
 {
 	int 	i;
 	
+	if (!ctr->subkeys) {
+		return False;
+	}
+
 	for ( i=0; i<ctr->num_subkeys; i++ ) {
 		if ( strequal( ctr->subkeys[i],keyname ) )
 			return True;