From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Shourya Shukla <shouryashukla.oo@gmail.com>,
christian.couder@gmail.com, git@vger.kernel.org,
kaartic.sivaraam@gmail.com
Subject: Re: [PATCH v5] submodule: port subcommand 'set-url' from shell to C
Date: Fri, 08 May 2020 09:13:50 -0700 [thread overview]
Message-ID: <xmqqlfm2z9oh.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200508063022.GA18557@generichostname> (Denton Liu's message of "Fri, 8 May 2020 02:30:22 -0400")
Denton Liu <liu.denton@gmail.com> writes:
> Hi Shourya,
>
> It looks good to me except for one tiny nit:
>
> On Fri, May 08, 2020 at 11:51:36AM +0530, Shourya Shukla wrote:
>> Convert submodule subcommand 'set-url' to a builtin. Port 'set-url' to
>> 'submodule--helper.c' and call the latter via 'git-submodule.sh'.
>>
>> Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
>> ---
>> builtin/submodule--helper.c | 37 +++++++++++++++++++++++++++++++++++++
>> git-submodule.sh | 22 +---------------------
>> 2 files changed, 38 insertions(+), 21 deletions(-)
>>
>> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
>> index 1a4b391c88..8bc7b4cfa6 100644
>> --- a/builtin/submodule--helper.c
>> +++ b/builtin/submodule--helper.c
>> @@ -2246,6 +2246,42 @@ static int module_config(int argc, const char **argv, const char *prefix)
>> usage_with_options(git_submodule_helper_usage, module_config_options);
>> }
>>
>> +static int module_set_url(int argc, const char **argv, const char *prefix)
>> +{
>> + int quiet = 0;
>> + const char *newurl;
>> + const char *path;
>> + char* config_name;
>
> The asterisk should be stuck with the name, not the type, similar to how
> you wrote it above.
Right.
>> +
>> + struct option options[] = {
>> + OPT__QUIET(&quiet, N_("Suppress output for setting url of a submodule")),
>> + OPT_END()
>> + };
>> + const char *const usage[] = {
>> + N_("git submodule--helper set-url [--quiet] <path> <newurl>"),
>> + NULL
>> + };
>> +
>> + argc = parse_options(argc, argv, prefix, options, usage, 0);
>> +
>> + path = argv[0];
>> + newurl = argv[1];
>> +
>> + if (argc != 2 || !path || !newurl) {
Checking argc at this point is too late to protect against the
potential out-of-bounds access we have already made to argv[0]
and argv[1].
next prev parent reply other threads:[~2020-05-08 16:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 7:37 [PATCH v4] submodule: port subcommand 'set-url' from shell to C Shourya Shukla
2020-05-06 8:09 ` Christian Couder
2020-05-06 16:31 ` Shourya Shukla
2020-05-06 17:16 ` Junio C Hamano
2020-05-06 17:12 ` Junio C Hamano
2020-05-06 18:12 ` Shourya Shukla
2020-05-06 18:22 ` Junio C Hamano
2020-05-07 4:40 ` Shourya Shukla
2020-05-07 5:08 ` Junio C Hamano
2020-05-08 5:47 ` Shourya Shukla
2020-05-08 6:18 ` Christian Couder
2020-05-08 15:18 ` Re* " Junio C Hamano
2020-05-08 15:38 ` Eric Sunshine
2020-05-08 15:57 ` Junio C Hamano
2020-05-08 16:13 ` Eric Sunshine
2020-05-08 16:38 ` Junio C Hamano
2020-05-08 17:51 ` Eric Sunshine
2020-05-08 6:21 ` [PATCH v5] " Shourya Shukla
2020-05-08 6:30 ` Denton Liu
2020-05-08 16:13 ` Junio C Hamano [this message]
2020-05-08 16:17 ` Junio C Hamano
2020-05-08 16:18 ` [PATCH v6] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlfm2z9oh.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=kaartic.sivaraam@gmail.com \
--cc=liu.denton@gmail.com \
--cc=shouryashukla.oo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).