r22589: Make TALLOC_ARRAY consistent across all uses.

Jeremy.
(This used to be commit 8968808c3b5b0208cbad9ac92eaf948f2c546dd9)

3 files changed, 147 insertions, 96 deletions

diff --git a/source3/libmsrpc/cac_lsarpc.c b/source3/libmsrpc/cac_lsarpc.c
index 2e3eb276d5..de53c0f483 100644
--- a/source3/libmsrpc/cac_lsarpc.c
+++ b/source3/libmsrpc/cac_lsarpc.c
@@ -203,11 +203,15 @@ int cac_LsaGetNamesFromSids( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
 
 	if ( NT_STATUS_IS_OK( hnd->status ) ) {
 		/*this is the easy part, just make the out.sids array */
-		sids_out = TALLOC_ARRAY( mem_ctx, CacSidInfo, num_sids );
-		if ( !sids_out ) {
-			errno = ENOMEM;
-			hnd->status = NT_STATUS_NO_MEMORY;
-			return CAC_FAILURE;
+		if (num_sids) {
+			sids_out = TALLOC_ARRAY( mem_ctx, CacSidInfo, num_sids );
+			if ( !sids_out ) {
+				errno = ENOMEM;
+				hnd->status = NT_STATUS_NO_MEMORY;
+				return CAC_FAILURE;
+			}
+		} else {
+			sids_out = NULL;
 		}
 
 		for ( i = 0; i < num_sids; i++ ) {
@@ -232,22 +236,29 @@ int cac_LsaGetNamesFromSids( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
 			return CAC_FAILURE;
 		}
 
-		sids_out =
-			TALLOC_ARRAY( mem_ctx, CacSidInfo,
+		if ( num_sids - num_unknown) {
+			sids_out =
+				TALLOC_ARRAY( mem_ctx, CacSidInfo,
 				      ( num_sids - num_unknown ) );
-		if ( !sids_out ) {
-			errno = ENOMEM;
-			hnd->status = NT_STATUS_NO_MEMORY;
-			return CAC_FAILURE;
+			if ( !sids_out ) {
+				errno = ENOMEM;
+				hnd->status = NT_STATUS_NO_MEMORY;
+				return CAC_FAILURE;
+			}
+		} else {
+			sids_out = NULL;
 		}
 
-		unknown_out = TALLOC_ARRAY( mem_ctx, DOM_SID, num_unknown );
-		if ( !unknown_out ) {
-			errno = ENOMEM;
-			hnd->status = NT_STATUS_NO_MEMORY;
-			return CAC_FAILURE;
+		if (num_unknown) {
+			unknown_out = TALLOC_ARRAY( mem_ctx, DOM_SID, num_unknown );
+			if ( !unknown_out ) {
+				errno = ENOMEM;
+				hnd->status = NT_STATUS_NO_MEMORY;
+				return CAC_FAILURE;
+			}
+		} else {
+			unknown_out = NULL;
 		}
-
 		found_idx = unknown_idx = 0;
 
 		/*now we can actually do the real work */
@@ -330,11 +341,15 @@ int cac_LsaGetSidsFromNames( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
 
 	if ( NT_STATUS_IS_OK( hnd->status ) ) {
 		/*this is the easy part, just make the out.sids array */
-		sids_out = TALLOC_ARRAY( mem_ctx, CacSidInfo, num_names );
-		if ( !sids_out ) {
-			errno = ENOMEM;
-			hnd->status = NT_STATUS_NO_MEMORY;
-			return CAC_FAILURE;
+		if (num_names) {
+			sids_out = TALLOC_ARRAY( mem_ctx, CacSidInfo, num_names );
+			if ( !sids_out ) {
+				errno = ENOMEM;
+				hnd->status = NT_STATUS_NO_MEMORY;
+				return CAC_FAILURE;
+			}
+		} else {
+			sids_out = NULL;
 		}
 
 		for ( i = 0; i < num_names; i++ ) {
@@ -360,20 +375,28 @@ int cac_LsaGetSidsFromNames( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
 			return CAC_FAILURE;
 		}
 
-		sids_out =
-			TALLOC_ARRAY( mem_ctx, CacSidInfo,
+		if (num_names - num_unknown) {
+			sids_out =
+				TALLOC_ARRAY( mem_ctx, CacSidInfo,
 				      ( num_names - num_unknown ) );
-		if ( !sids_out ) {
-			errno = ENOMEM;
-			hnd->status = NT_STATUS_NO_MEMORY;
-			return CAC_FAILURE;
+			if ( !sids_out ) {
+				errno = ENOMEM;
+				hnd->status = NT_STATUS_NO_MEMORY;
+				return CAC_FAILURE;
+			}
+		} else {
+			sids_out = NULL;
 		}
 
-		unknown_out = TALLOC_ARRAY( mem_ctx, char *, num_unknown );
-		if ( !unknown_out ) {
-			errno = ENOMEM;
-			hnd->status = NT_STATUS_NO_MEMORY;
-			return CAC_FAILURE;
+		if (num_unknown) {
+			unknown_out = TALLOC_ARRAY( mem_ctx, char *, num_unknown );
+			if ( !unknown_out ) {
+				errno = ENOMEM;
+				hnd->status = NT_STATUS_NO_MEMORY;
+				return CAC_FAILURE;
+			}
+		} else {
+			unknown_out = NULL;
 		}
 
 		unknown_idx = found_idx = 0;
diff --git a/source3/libmsrpc/cac_samr.c b/source3/libmsrpc/cac_samr.c
index e50fb474f5..4d3acc85e3 100644
--- a/source3/libmsrpc/cac_samr.c
+++ b/source3/libmsrpc/cac_samr.c
@@ -557,10 +557,14 @@ int cac_SamGetNamesFromRids( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
 	     && !NT_STATUS_EQUAL( hnd->status, STATUS_SOME_UNMAPPED ) )
 		return CAC_FAILURE;
 
-	map_out = TALLOC_ARRAY( mem_ctx, CacLookupRidsRecord, num_names_out );
-	if ( !map_out ) {
-		hnd->status = NT_STATUS_NO_MEMORY;
-		return CAC_FAILURE;
+	if (num_names_out) {
+		map_out = TALLOC_ARRAY( mem_ctx, CacLookupRidsRecord, num_names_out );
+		if ( !map_out ) {
+			hnd->status = NT_STATUS_NO_MEMORY;
+			return CAC_FAILURE;
+		}
+	} else {
+		map_out = NULL;
 	}
 
 	for ( i = 0; i < num_names_out; i++ ) {
@@ -643,10 +647,14 @@ int cac_SamGetRidsFromNames( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
 	     && !NT_STATUS_EQUAL( hnd->status, STATUS_SOME_UNMAPPED ) )
 		return CAC_FAILURE;
 
-	map_out = TALLOC_ARRAY( mem_ctx, CacLookupRidsRecord, num_rids_out );
-	if ( !map_out ) {
-		hnd->status = NT_STATUS_NO_MEMORY;
-		return CAC_FAILURE;
+	if (num_rids_out) {
+		map_out = TALLOC_ARRAY( mem_ctx, CacLookupRidsRecord, num_rids_out );
+		if ( !map_out ) {
+			hnd->status = NT_STATUS_NO_MEMORY;
+			return CAC_FAILURE;
+		}
+	} else {
+		map_out = NULL;
 	}
 
 	for ( i = 0; i < num_rids_out; i++ ) {
@@ -718,16 +726,20 @@ int cac_SamGetGroupsForUser( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
 		return CAC_FAILURE;
 
 
-	rids_out = TALLOC_ARRAY( mem_ctx, uint32, num_groups_out );
-	if ( !rids_out ) {
-		hnd->status = NT_STATUS_NO_MEMORY;
-		return CAC_FAILURE;
-	}
-
-	attr_out = TALLOC_ARRAY( mem_ctx, uint32, num_groups_out );
-	if ( !attr_out ) {
-		hnd->status = NT_STATUS_NO_MEMORY;
-		return CAC_FAILURE;
+	if (num_groups_out) {
+		rids_out = TALLOC_ARRAY( mem_ctx, uint32, num_groups_out );
+		if ( !rids_out ) {
+			hnd->status = NT_STATUS_NO_MEMORY;
+			return CAC_FAILURE;
+		}
+		attr_out = TALLOC_ARRAY( mem_ctx, uint32, num_groups_out );
+		if ( !attr_out ) {
+			hnd->status = NT_STATUS_NO_MEMORY;
+			return CAC_FAILURE;
+		}
+	} else {
+		rids_out = NULL;
+		attr_out = NULL;
 	}
 
 	for ( i = 0; i < num_groups_out; i++ ) {
@@ -1153,28 +1165,34 @@ int cac_SamEnumGroups( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
 		return CAC_FAILURE;
 	}
 
-	names_out = TALLOC_ARRAY( mem_ctx, char *, num_groups_out );
-	if ( !names_out ) {
-		hnd->status = NT_STATUS_NO_MEMORY;
-		TALLOC_FREE( acct_buf );
-		return CAC_FAILURE;
-	}
+	if (num_groups_out) {
+		names_out = TALLOC_ARRAY( mem_ctx, char *, num_groups_out );
+		if ( !names_out ) {
+			hnd->status = NT_STATUS_NO_MEMORY;
+			TALLOC_FREE( acct_buf );
+			return CAC_FAILURE;
+		}
 
-	desc_out = TALLOC_ARRAY( mem_ctx, char *, num_groups_out );
-	if ( !desc_out ) {
-		hnd->status = NT_STATUS_NO_MEMORY;
-		TALLOC_FREE( acct_buf );
-		TALLOC_FREE( names_out );
-		return CAC_FAILURE;
-	}
+		desc_out = TALLOC_ARRAY( mem_ctx, char *, num_groups_out );
+		if ( !desc_out ) {
+			hnd->status = NT_STATUS_NO_MEMORY;
+			TALLOC_FREE( acct_buf );
+			TALLOC_FREE( names_out );
+			return CAC_FAILURE;
+		}
 
-	rids_out = TALLOC_ARRAY( mem_ctx, uint32, num_groups_out );
-	if ( !rids_out ) {
-		hnd->status = NT_STATUS_NO_MEMORY;
-		TALLOC_FREE( acct_buf );
-		TALLOC_FREE( names_out );
-		TALLOC_FREE( desc_out );
-		return CAC_FAILURE;
+		rids_out = TALLOC_ARRAY( mem_ctx, uint32, num_groups_out );
+		if ( !rids_out ) {
+			hnd->status = NT_STATUS_NO_MEMORY;
+			TALLOC_FREE( acct_buf );
+			TALLOC_FREE( names_out );
+			TALLOC_FREE( desc_out );
+			return CAC_FAILURE;
+		}
+	} else {
+		names_out = NULL;
+		desc_out = NULL;
+		rids_out = NULL;
 	}
 
 	for ( i = 0; i < num_groups_out; i++ ) {
@@ -1256,28 +1274,34 @@ int cac_SamEnumAliases( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
 	     NT_STATUS_V( STATUS_MORE_ENTRIES ) )
 		return CAC_FAILURE;
 
-	names_out = TALLOC_ARRAY( mem_ctx, char *, num_als_out );
-	if ( !names_out ) {
-		hnd->status = NT_STATUS_NO_MEMORY;
-		TALLOC_FREE( acct_buf );
-		return CAC_FAILURE;
-	}
+	if (num_als_out) {
+		names_out = TALLOC_ARRAY( mem_ctx, char *, num_als_out );
+		if ( !names_out ) {
+			hnd->status = NT_STATUS_NO_MEMORY;
+			TALLOC_FREE( acct_buf );
+			return CAC_FAILURE;
+		}
 
-	desc_out = TALLOC_ARRAY( mem_ctx, char *, num_als_out );
-	if ( !desc_out ) {
-		hnd->status = NT_STATUS_NO_MEMORY;
-		TALLOC_FREE( acct_buf );
-		TALLOC_FREE( names_out );
-		return CAC_FAILURE;
-	}
+		desc_out = TALLOC_ARRAY( mem_ctx, char *, num_als_out );
+		if ( !desc_out ) {
+			hnd->status = NT_STATUS_NO_MEMORY;
+			TALLOC_FREE( acct_buf );
+			TALLOC_FREE( names_out );
+			return CAC_FAILURE;
+		}
 
-	rids_out = TALLOC_ARRAY( mem_ctx, uint32, num_als_out );
-	if ( !rids_out ) {
-		hnd->status = NT_STATUS_NO_MEMORY;
-		TALLOC_FREE( acct_buf );
-		TALLOC_FREE( names_out );
-		TALLOC_FREE( desc_out );
-		return CAC_FAILURE;
+		rids_out = TALLOC_ARRAY( mem_ctx, uint32, num_als_out );
+		if ( !rids_out ) {
+			hnd->status = NT_STATUS_NO_MEMORY;
+			TALLOC_FREE( acct_buf );
+			TALLOC_FREE( names_out );
+			TALLOC_FREE( desc_out );
+			return CAC_FAILURE;
+		}
+	} else {
+		names_out = NULL;
+		desc_out = NULL;
+		rids_out = NULL;
 	}
 
 	for ( i = 0; i < num_als_out; i++ ) {
diff --git a/source3/libmsrpc/libmsrpc_internal.c b/source3/libmsrpc/libmsrpc_internal.c
index 64e6332e80..3cb702e376 100644
--- a/source3/libmsrpc/libmsrpc_internal.c
+++ b/source3/libmsrpc/libmsrpc_internal.c
@@ -299,12 +299,16 @@ REG_VALUE_DATA *cac_MakeRegValueData( TALLOC_CTX * mem_ctx, uint32 data_type,
 				break;
 		}
 
-		strings = TALLOC_ARRAY( mem_ctx, char *, num_strings );
+		if (num_strings) {
+			strings = TALLOC_ARRAY( mem_ctx, char *, num_strings );
 
-		if ( !strings ) {
-			errno = ENOMEM;
-			TALLOC_FREE( data );
-			break;
+			if ( !strings ) {
+				errno = ENOMEM;
+				TALLOC_FREE( data );
+				break;
+			}
+		} else {
+			strings = NULL;
 		}
 
 		if ( num_strings == 0 )	/*then our work here is done */