svn commit: samba r14134 - branches/SAMBA_3_0/source/rpc_parse trunk/source/rpc_parse

vlendec at samba.org vlendec at samba.org
Fri Mar 10 09:07:04 GMT 2006


Author: vlendec
Date: 2006-03-10 09:07:03 +0000 (Fri, 10 Mar 2006)
New Revision: 14134

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

Log:
Fix Coverity bug # 137
Modified:
   branches/SAMBA_3_0/source/rpc_parse/parse_lsa.c
   trunk/source/rpc_parse/parse_lsa.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_lsa.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_lsa.c	2006-03-10 08:56:13 UTC (rev 14133)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_lsa.c	2006-03-10 09:07:03 UTC (rev 14134)
@@ -567,10 +567,16 @@
 		/* allocate container memory */
 		
 		out->domlist = TALLOC_P( ctx, DOMAIN_LIST );
+
+		if ( !out->domlist ) {
+			out->status = NT_STATUS_NO_MEMORY;
+			return;
+		}
+
 		out->domlist->domains = TALLOC_ARRAY( ctx, DOMAIN_INFO,
 						      out->count );
 		
-		if ( !out->domlist || !out->domlist->domains ) {
+		if ( !out->domlist->domains ) {
 			out->status = NT_STATUS_NO_MEMORY;
 			return;
 		}

Modified: trunk/source/rpc_parse/parse_lsa.c
===================================================================
--- trunk/source/rpc_parse/parse_lsa.c	2006-03-10 08:56:13 UTC (rev 14133)
+++ trunk/source/rpc_parse/parse_lsa.c	2006-03-10 09:07:03 UTC (rev 14134)
@@ -567,10 +567,16 @@
 		/* allocate container memory */
 		
 		out->domlist = TALLOC_P( ctx, DOMAIN_LIST );
+
+		if ( !out->domlist ) {
+			out->status = NT_STATUS_NO_MEMORY;
+			return;
+		}
+
 		out->domlist->domains = TALLOC_ARRAY( ctx, DOMAIN_INFO,
 						      out->count );
 		
-		if ( !out->domlist || !out->domlist->domains ) {
+		if ( !out->domlist->domains ) {
 			out->status = NT_STATUS_NO_MEMORY;
 			return;
 		}



More information about the samba-cvs mailing list