From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick Steinhardt Subject: [PATCH] bundle: verify arguments more strictly Date: Fri, 8 May 2015 09:49:01 +0200 Message-ID: <1431071341-23363-1-git-send-email-ps@pks.im> Cc: Patrick Steinhardt To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri May 08 09:49:36 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yqd2N-0006U1-0m for gcvg-git-2@plane.gmane.org; Fri, 08 May 2015 09:49:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751319AbbEHHtZ (ORCPT ); Fri, 8 May 2015 03:49:25 -0400 Received: from sender1.zohomail.com ([74.201.84.162]:28927 "EHLO sender1.zohomail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752005AbbEHHtZ (ORCPT ); Fri, 8 May 2015 03:49:25 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=mail; d=pks.im; h=from:to:cc:subject:date:message-id; b=iymqGV5WHI1/7PUD8zE7SvEGY33d1/ZQIvbQBwBr+c8FQLQX25EsZUcgN7/kFmzy3twumvmDQAk/ tqx30kWYGs+x0nht/6YtMMGEMJRjvwGk+YiXZuiEWIBioty7TMxRt88UzVBCGDu9RVCa6khrFknd wr5MnnXL4nGyxboAzkE= Received: from localhost (x5ce10939.dyn.telefonica.de [92.225.9.57]) by mx.zohomail.com with SMTPS id 1431071362300818.3745828245565; Fri, 8 May 2015 00:49:22 -0700 (PDT) X-Mailer: git-send-email 2.4.0 X-ZohoMail: Ss SS_10 UW1 iCHF_KNW_WHT_EXT SGR3_0_16045_2 X-ZohoMail-Owner: <1431071341-23363-1-git-send-email-ps@pks.im>+zmo_0_ X-ZohoMail-Sender: 92.225.9.57 X-Zoho-Virus-Status: 2 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The `verify` and `create` subcommands of the bundle builtin do not properly verify the command line arguments that have been passed in. While the `verify` subcommand accepts an arbitrary amount of ignored arguments the `create` subcommand does not complain about being passed too few arguments, resulting in a bogus call to `git rev-list`. Fix these errors by verifying that the correct amount of arguments has been passed in. --- builtin/bundle.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/builtin/bundle.c b/builtin/bundle.c index 92a8a60..4883a43 100644 --- a/builtin/bundle.c +++ b/builtin/bundle.c @@ -42,6 +42,10 @@ int cmd_bundle(int argc, const char **argv, const char *prefix) if (!strcmp(cmd, "verify")) { close(bundle_fd); + if (argc != 1) { + usage(builtin_bundle_usage); + return 1; + } if (verify_bundle(&header, 1)) return 1; fprintf(stderr, _("%s is okay\n"), bundle_file); @@ -52,6 +56,10 @@ int cmd_bundle(int argc, const char **argv, const char *prefix) return !!list_bundle_refs(&header, argc, argv); } if (!strcmp(cmd, "create")) { + if (argc < 2) { + usage(builtin_bundle_usage); + return 1; + } if (!startup_info->have_repository) die(_("Need a repository to create a bundle.")); return !!create_bundle(&header, bundle_file, argc, argv); -- 2.4.0