From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org, dwwang@google.com, e@80x24.org,
peff@peff.net, dennis@kaarsemaker.net, jrnieder@gmail.com
Subject: Re: [PATCH 2/4] receive-pack: implement advertising and receiving push options
Date: Thu, 14 Jul 2016 11:38:02 -0700 [thread overview]
Message-ID: <xmqqk2goqd4l.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160714173920.22001-3-sbeller@google.com> (Stefan Beller's message of "Thu, 14 Jul 2016 10:39:18 -0700")
Stefan Beller <sbeller@google.com> writes:
> +static struct string_list *read_push_options(void)
> +{
> + struct string_list *ret = xmalloc(sizeof(*ret));
> + string_list_init(ret, 1);
> +
> + while (1) {
> + char *line, *lf;
> + int len;
> +
> + line = packet_read_line(0, &len);
> +
> + if (!line)
> + break;
> +
> + /*
> + * NEEDSWORK: expose the limitations to be configurable;
> + * Once the limit can be lifted, include a way for payloads
> + * larger than one pkt, e.g use last byte to indicate if
> + * the push option continues in the next packet or implement
> + * larger packets.
> + */
> + if (len > LARGE_PACKET_MAX - 1) {
packet_read_line() calls packet_read_line_generic() that calls
packet_read() with the fixed packet_buffer[] that is sized to be
LARGE_PACKET_MAX.
Can this check even trigger?
> + /*
> + * NEEDSWORK: The error message in die(..) is not
> + * transmitted in call cases, so ideally all die(..)
> + * calls are prefixed with rp_error and then we can
> + * combine rp_error && die into one helper function.
> + */
> + rp_error("protocol error: server configuration allows push "
> + "options of size up to %d bytes",
> + LARGE_PACKET_MAX - 1);
> + die("protocol error: push options too large");
> + }
> + lf = strchr(line, '\n');
> + if (lf)
> + *lf = '\0';
packet_read_line() -> packet_read_line_generic() calls packet_read()
with PACKET_READ_CHOMP_NEWLINE flag bit; do we need this check?
> +
> + string_list_append(ret, line);
> + }
> +
> + return ret;
> +}
Other than that, looks good to me.
Thanks.
next prev parent reply other threads:[~2016-07-14 18:38 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-14 17:39 [PATCHv5 0/4] Push options Stefan Beller
2016-07-14 17:39 ` [PATCH 1/4] push options: {pre,post}-receive hook learns about push options Stefan Beller
2016-07-14 17:39 ` [PATCH 2/4] receive-pack: implement advertising and receiving " Stefan Beller
2016-07-14 18:38 ` Junio C Hamano [this message]
2016-07-14 19:00 ` Stefan Beller
2016-07-14 19:07 ` Junio C Hamano
2016-07-14 19:45 ` Jeff King
2016-07-14 20:07 ` Junio C Hamano
2016-07-14 17:39 ` [PATCH 3/4] push: accept " Stefan Beller
2016-07-14 17:39 ` [PATCH 4/4] add a test for " Stefan Beller
2016-07-14 18:41 ` [PATCHv5 0/4] Push options Jeff King
2016-07-14 18:48 ` Stefan Beller
2016-07-14 18:50 ` Jeff King
-- strict thread matches above, loose matches on Subject: below --
2016-07-14 21:49 [PATCHv7 " Stefan Beller
2016-07-14 21:49 ` [PATCH 2/4] receive-pack: implement advertising and receiving push options Stefan Beller
2016-07-09 0:31 [PATCHv4 0/4] Push options Stefan Beller
2016-07-09 0:31 ` [PATCH 2/4] receive-pack: implement advertising and receiving push options Stefan Beller
2016-07-10 17:06 ` Shawn Pearce
2016-07-10 18:05 ` Stefan Beller
2016-07-12 4:53 ` Shawn Pearce
2016-07-12 5:24 ` Jeff King
2016-07-07 1:12 [PATCHv3 0/4] Push options in C Git Stefan Beller
2016-07-07 1:12 ` [PATCH 2/4] receive-pack: implement advertising and receiving push options Stefan Beller
2016-07-07 20:37 ` Junio C Hamano
2016-07-07 21:41 ` Stefan Beller
2016-07-07 21:56 ` Jeff King
2016-07-07 22:06 ` Stefan Beller
2016-07-07 22:09 ` Jeff King
2016-07-07 22:06 ` Junio C Hamano
2016-07-08 17:58 ` Jonathan Nieder
2016-07-08 18:39 ` Junio C Hamano
2016-07-08 18:57 ` Stefan Beller
2016-07-08 21:46 ` Jeff King
2016-07-08 22:17 ` Stefan Beller
2016-07-08 22:21 ` Jeff King
2016-07-08 22:29 ` Stefan Beller
2016-07-08 22:35 ` Jeff King
2016-07-08 22:43 ` Stefan Beller
2016-07-08 22:46 ` Jeff King
2016-07-08 22:51 ` Stefan Beller
2016-06-30 0:59 [RFC PATCHv1 0/4] Push options in C Git Stefan Beller
2016-06-30 0:59 ` [PATCH 2/4] receive-pack: implement advertising and receiving push options Stefan Beller
2016-07-01 17:11 ` Junio C Hamano
2016-07-01 17:24 ` Stefan Beller
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk2goqd4l.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=dennis@kaarsemaker.net \
--cc=dwwang@google.com \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).