svn commit: samba r14280 - branches/SAMBA_3_0/source/lib trunk/source/lib

[jmcd at samba.org]

Author: jmcd
Date: 2006-03-13 01:49:01 +0000 (Mon, 13 Mar 2006)
New Revision: 14280

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

Log:
Fix Coverity #129 and 130: check before dereferencing a pointer.  This
was especially silly as we checked immediately _after_ dereferencing it
:-/

Modified:
   branches/SAMBA_3_0/source/lib/secdesc.c
   trunk/source/lib/secdesc.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/secdesc.c
===================================================================
--- branches/SAMBA_3_0/source/lib/secdesc.c	2006-03-13 01:42:40 UTC (rev 14279)
+++ branches/SAMBA_3_0/source/lib/secdesc.c	2006-03-13 01:49:01 UTC (rev 14280)
@@ -336,11 +336,11 @@
 	SEC_ACE  *ace  = 0;
 	NTSTATUS  status;
 
-	*sd_size = 0;
-
 	if (!ctx || !psd || !sid || !sd_size)
 		return NT_STATUS_INVALID_PARAMETER;
 
+	*sd_size = 0;
+
 	status = sec_ace_add_sid(ctx, &ace, psd[0]->dacl->ace, &psd[0]->dacl->num_aces, sid, mask);
 	
 	if (!NT_STATUS_IS_OK(status))
@@ -388,11 +388,11 @@
 	SEC_ACE  *ace  = 0;
 	NTSTATUS  status;
 
-	*sd_size = 0;
-	
 	if (!ctx || !psd[0] || !sid || !sd_size)
 		return NT_STATUS_INVALID_PARAMETER;
 
+	*sd_size = 0;
+	
 	status = sec_ace_del_sid(ctx, &ace, psd[0]->dacl->ace, &psd[0]->dacl->num_aces, sid);
 
 	if (!NT_STATUS_IS_OK(status))

Modified: trunk/source/lib/secdesc.c
===================================================================
--- trunk/source/lib/secdesc.c	2006-03-13 01:42:40 UTC (rev 14279)
+++ trunk/source/lib/secdesc.c	2006-03-13 01:49:01 UTC (rev 14280)
@@ -336,11 +336,11 @@
 	SEC_ACE  *ace  = 0;
 	NTSTATUS  status;
 
-	*sd_size = 0;
-
 	if (!ctx || !psd || !sid || !sd_size)
 		return NT_STATUS_INVALID_PARAMETER;
 
+	*sd_size = 0;
+
 	status = sec_ace_add_sid(ctx, &ace, psd[0]->dacl->ace, &psd[0]->dacl->num_aces, sid, mask);
 	
 	if (!NT_STATUS_IS_OK(status))
@@ -388,11 +388,11 @@
 	SEC_ACE  *ace  = 0;
 	NTSTATUS  status;
 
-	*sd_size = 0;
-	
 	if (!ctx || !psd[0] || !sid || !sd_size)
 		return NT_STATUS_INVALID_PARAMETER;
 
+	*sd_size = 0;
+	
 	status = sec_ace_del_sid(ctx, &ace, psd[0]->dacl->ace, &psd[0]->dacl->num_aces, sid);
 
 	if (!NT_STATUS_IS_OK(status))