svn commit: samba r24291 - in branches: SAMBA_3_2/source/rpc_parse SAMBA_3_2_0/source/rpc_parse

[vlendec at samba.org]

Author: vlendec
Date: 2007-08-09 20:54:58 +0000 (Thu, 09 Aug 2007)
New Revision: 24291

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

Log:
Fix Coverity ID 364

We've checked num_rids != 0 above.

Modified:
   branches/SAMBA_3_2/source/rpc_parse/parse_samr.c
   branches/SAMBA_3_2_0/source/rpc_parse/parse_samr.c


Changeset:
Modified: branches/SAMBA_3_2/source/rpc_parse/parse_samr.c
===================================================================
--- branches/SAMBA_3_2/source/rpc_parse/parse_samr.c	2007-08-09 19:03:23 UTC (rev 24290)
+++ branches/SAMBA_3_2/source/rpc_parse/parse_samr.c	2007-08-09 20:54:58 UTC (rev 24291)
@@ -4993,26 +4993,17 @@
 		r_u->ptr_rids = 1;
 		r_u->num_rids2 = num_rids;
 
-		if (num_rids) {
-			if (!(r_u->rids = TALLOC_ZERO_ARRAY(ctx, uint32, num_rids)))
-				return NT_STATUS_NO_MEMORY;
-			if (!(r_u->types = TALLOC_ZERO_ARRAY(ctx, uint32, num_rids)))
-				return NT_STATUS_NO_MEMORY;
-		} else {
-			r_u->rids = NULL;
-			r_u->types = NULL;
-		}
+		if (!(r_u->rids = TALLOC_ZERO_ARRAY(ctx, uint32, num_rids)))
+			return NT_STATUS_NO_MEMORY;
+		if (!(r_u->types = TALLOC_ZERO_ARRAY(ctx, uint32, num_rids)))
+			return NT_STATUS_NO_MEMORY;
 
-		if (!r_u->rids || !r_u->types)
-			goto empty;
-
 		for (i = 0; i < num_rids; i++) {
 			r_u->rids[i] = rid[i];
 			r_u->types[i] = type[i];
 		}
 	} else {
 
-  empty:
 		r_u->num_types1 = 0;
 		r_u->ptr_types = 0;
 		r_u->num_types2 = 0;

Modified: branches/SAMBA_3_2_0/source/rpc_parse/parse_samr.c
===================================================================
--- branches/SAMBA_3_2_0/source/rpc_parse/parse_samr.c	2007-08-09 19:03:23 UTC (rev 24290)
+++ branches/SAMBA_3_2_0/source/rpc_parse/parse_samr.c	2007-08-09 20:54:58 UTC (rev 24291)
@@ -4923,26 +4923,17 @@
 		r_u->ptr_rids = 1;
 		r_u->num_rids2 = num_rids;
 
-		if (num_rids) {
-			if (!(r_u->rids = TALLOC_ZERO_ARRAY(ctx, uint32, num_rids)))
-				return NT_STATUS_NO_MEMORY;
-			if (!(r_u->types = TALLOC_ZERO_ARRAY(ctx, uint32, num_rids)))
-				return NT_STATUS_NO_MEMORY;
-		} else {
-			r_u->rids = NULL;
-			r_u->types = NULL;
-		}
+		if (!(r_u->rids = TALLOC_ZERO_ARRAY(ctx, uint32, num_rids)))
+			return NT_STATUS_NO_MEMORY;
+		if (!(r_u->types = TALLOC_ZERO_ARRAY(ctx, uint32, num_rids)))
+			return NT_STATUS_NO_MEMORY;
 
-		if (!r_u->rids || !r_u->types)
-			goto empty;
-
 		for (i = 0; i < num_rids; i++) {
 			r_u->rids[i] = rid[i];
 			r_u->types[i] = type[i];
 		}
 	} else {
 
-  empty:
 		r_u->num_types1 = 0;
 		r_u->ptr_types = 0;
 		r_u->num_types2 = 0;