Author: vlendec Date: 2007-08-04 10:32:54 +0000 (Sat, 04 Aug 2007) New Revision: 24167
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24167 Log: Fix Coverity ID 365 We checked argc>=3 some lines above Modified: branches/SAMBA_3_2/source/rpcclient/cmd_samr.c branches/SAMBA_3_2_0/source/rpcclient/cmd_samr.c Changeset: Modified: branches/SAMBA_3_2/source/rpcclient/cmd_samr.c =================================================================== --- branches/SAMBA_3_2/source/rpcclient/cmd_samr.c 2007-08-04 10:25:27 UTC (rev 24166) +++ branches/SAMBA_3_2/source/rpcclient/cmd_samr.c 2007-08-04 10:32:54 UTC (rev 24167) @@ -1798,18 +1798,15 @@ /* Look up names */ num_names = argc - 2; - if (num_names) { - if ((names = TALLOC_ARRAY(mem_ctx, const char *, num_names)) == NULL) { - rpccli_samr_close(cli, mem_ctx, &domain_pol); - rpccli_samr_close(cli, mem_ctx, &connect_pol); - result = NT_STATUS_NO_MEMORY; - goto done; - } - } else { - names = NULL; + + if ((names = TALLOC_ARRAY(mem_ctx, const char *, num_names)) == NULL) { + rpccli_samr_close(cli, mem_ctx, &domain_pol); + rpccli_samr_close(cli, mem_ctx, &connect_pol); + result = NT_STATUS_NO_MEMORY; + goto done; } - for (i = 0; i < argc - 2; i++) + for (i = 0; i < num_names; i++) names[i] = argv[i + 2]; result = rpccli_samr_lookup_names(cli, mem_ctx, &domain_pol, Modified: branches/SAMBA_3_2_0/source/rpcclient/cmd_samr.c =================================================================== --- branches/SAMBA_3_2_0/source/rpcclient/cmd_samr.c 2007-08-04 10:25:27 UTC (rev 24166) +++ branches/SAMBA_3_2_0/source/rpcclient/cmd_samr.c 2007-08-04 10:32:54 UTC (rev 24167) @@ -1668,18 +1668,15 @@ /* Look up names */ num_names = argc - 2; - if (num_names) { - if ((names = TALLOC_ARRAY(mem_ctx, const char *, num_names)) == NULL) { - rpccli_samr_close(cli, mem_ctx, &domain_pol); - rpccli_samr_close(cli, mem_ctx, &connect_pol); - result = NT_STATUS_NO_MEMORY; - goto done; - } - } else { - names = NULL; + + if ((names = TALLOC_ARRAY(mem_ctx, const char *, num_names)) == NULL) { + rpccli_samr_close(cli, mem_ctx, &domain_pol); + rpccli_samr_close(cli, mem_ctx, &connect_pol); + result = NT_STATUS_NO_MEMORY; + goto done; } - for (i = 0; i < argc - 2; i++) + for (i = 0; i < num_names; i++) names[i] = argv[i + 2]; result = rpccli_samr_lookup_names(cli, mem_ctx, &domain_pol,
