Re: [PATCH v2] trace2: prevent segfault on config collection where no value specified
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 22, 2025, 18:12 UTC
- Message-ID
- <xmqqfrlawwd9.fsf@gitster.g>
- In-Reply-To
- <c1398676-ddd7-c161-e114-2249316b5311@gmx.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> > This patch looks good to me!
Thanks. As I punted on reviewing the tgt_perf part, it is very good to see somebody else step in to look it over.
Will queue.
Show 22 quoted lines
>> diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c >> index a6f9a8a193e..19ae7433ef8 100644 >> --- a/trace2/tr2_tgt_perf.c >> +++ b/trace2/tr2_tgt_perf.c >> @@ -446,8 +446,9 @@ static void fn_param_fl(const char *file, int line, const char *param, >> struct strbuf scope_payload = STRBUF_INIT; >> enum config_scope scope = kvi->scope; >> const char *scope_name = config_scope_name(scope); >> - >> - strbuf_addf(&buf_payload, "%s:%s", param, value); >> + strbuf_addstr(&buf_payload, param); >> + if (value) >> + strbuf_addf(&buf_payload, ":%s", value); >> strbuf_addf(&scope_payload, "%s:%s", "scope", scope_name); >> >> perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, >> >> base-commit: 8f8d6eee531b3fa1a8ef14f169b0cb5035f7a772 >> -- >> gitgitgadget >> >>