r24167: Fix Coverity ID 365
authorVolker Lendecke <vlendec@samba.org>
Sat, 4 Aug 2007 10:32:54 +0000 (10:32 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:29:17 +0000 (12:29 -0500)
We checked argc>=3 some lines above

source/rpcclient/cmd_samr.c

index b5ccab88863e9878bae61261343ea9f94cb9a2f6..d8528339fe90908b215b83ce464ab3de7ec1cb12 100644 (file)
@@ -1798,18 +1798,15 @@ static NTSTATUS cmd_samr_lookup_names(struct rpc_pipe_client *cli,
        /* 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,