svn commit: samba r19075 - in branches: SAMBA_3_0/source/lib/ldb/common SAMBA_4_0/source/lib/ldb/common

[vlendec at samba.org]

Author: vlendec
Date: 2006-10-04 20:15:23 +0000 (Wed, 04 Oct 2006)
New Revision: 19075

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

Log:
Fix a potential NULL dereference
Modified:
   branches/SAMBA_3_0/source/lib/ldb/common/ldb_dn.c
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/ldb/common/ldb_dn.c
===================================================================
--- branches/SAMBA_3_0/source/lib/ldb/common/ldb_dn.c	2006-10-04 19:45:34 UTC (rev 19074)
+++ branches/SAMBA_3_0/source/lib/ldb/common/ldb_dn.c	2006-10-04 20:15:23 UTC (rev 19075)
@@ -674,6 +674,7 @@
 	dst.name = talloc_strdup(mem_ctx, src->name);
 	if (dst.name == NULL) {
 		talloc_free(dst.value.data);
+		dst.value.data = NULL;
 	}
 
 	return dst;
@@ -826,6 +827,9 @@
 	for (i = 0; i < dn1->comp_num; i++) {
 		newdn->components[i] = ldb_dn_copy_component(newdn->components,
 							   &(dn1->components[i]));
+		if (newdn->components[i].value.data == NULL) {
+			goto failed;
+		}
 	}
 
 	return newdn;

Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c	2006-10-04 19:45:34 UTC (rev 19074)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c	2006-10-04 20:15:23 UTC (rev 19075)
@@ -674,6 +674,7 @@
 	dst.name = talloc_strdup(mem_ctx, src->name);
 	if (dst.name == NULL) {
 		talloc_free(dst.value.data);
+		dst.value.data = NULL;
 	}
 
 	return dst;
@@ -826,6 +827,9 @@
 	for (i = 0; i < dn1->comp_num; i++) {
 		newdn->components[i] = ldb_dn_copy_component(newdn->components,
 							   &(dn1->components[i]));
+		if (newdn->components[i].value.data == NULL) {
+			goto failed;
+		}
 	}
 
 	return newdn;