svn commit: samba r15562 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[vlendec at samba.org]

Author: vlendec
Date: 2006-05-13 09:27:56 +0000 (Sat, 13 May 2006)
New Revision: 15562

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

Log:
Attempt to fix Coverity bug # 283
Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
   trunk/source/nsswitch/winbindd_ads.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c	2006-05-13 05:06:20 UTC (rev 15561)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c	2006-05-13 09:27:56 UTC (rev 15562)
@@ -849,6 +849,14 @@
 	(*name_types) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_members);
 	(*names) = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_members);
 
+	if ((num_members != 0) &&
+	    ((members == NULL) || (*sid_mem == NULL) ||
+	     (*name_types == NULL) || (*names == NULL))) {
+		DEBUG(1, ("talloc failed\n"));
+		status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
+ 
 	for (i=0;i<num_members;i++) {
 		uint32 name_type;
 		char *name;

Modified: trunk/source/nsswitch/winbindd_ads.c
===================================================================
--- trunk/source/nsswitch/winbindd_ads.c	2006-05-13 05:06:20 UTC (rev 15561)
+++ trunk/source/nsswitch/winbindd_ads.c	2006-05-13 09:27:56 UTC (rev 15562)
@@ -849,6 +849,14 @@
 	(*name_types) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_members);
 	(*names) = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_members);
 
+	if ((num_members != 0) &&
+	    ((members == NULL) || (*sid_mem == NULL) ||
+	     (*name_types == NULL) || (*names == NULL))) {
+		DEBUG(1, ("talloc failed\n"));
+		status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
+ 
 	for (i=0;i<num_members;i++) {
 		uint32 name_type;
 		char *name;