Re: [PATCH v2 03/25] transport-helper.c: do not send null option to remote helper
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:08:06
Nguyễn Thái Ngọc Duy [off-list ref] writes:
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> ---
This is even more strange. Are the current callers broken and some sends value==NULL for an option that is not is_bool, resulting in a call to quote_c_style() with NULL? I somehow find it hard to believe as that would lead to an immediate segfault. Assuming that no current caller passes NULL to value when is_bool is not in effect, there needs an explanation why future new callers may need to do so. An alternative for a valueless option could be to send "option name\n" instead of the usual "option name value\n", but without such an explanation, readers cannot tell why not sending anything about "name", which is what this patch chooses to implement, is a better idea.
quoted hunk
transport-helper.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)diff --git a/transport-helper.c b/transport-helper.c index 35023da..2e78c4d 100644 --- a/transport-helper.c +++ b/transport-helper.c@@ -309,8 +309,12 @@ static int set_helper_option(struct transport *transport, strbuf_addf(&buf, "option %s ", name); if (is_bool) strbuf_addstr(&buf, value ? "true" : "false"); - else + else if (value) quote_c_style(value, &buf, NULL, 0); + else { + strbuf_release(&buf); + return 0; + } strbuf_addch(&buf, '\n'); ret = strbuf_set_helper_option(data, &buf);