Subject: Re: [PATCH v8] submodule merge: update conflict error message

From: Junio C Hamano <[email-masked]>
Date: Tue, 16 Aug 2022 11:58:05 -0700

Junio C Hamano <[email-masked]> writes:

>> +			 * languages, the following swap is suggested:
>> +			 *      "   %s\n" -> "%s   \n"
>> +			 */
>> +			strbuf_addf(&tmp, _("   %s\n"), msg_list.items[i].string);
>> +	}
>> +	strbuf_reset(msg);
>> +	strbuf_add(msg, tmp.buf, tmp.len);
>> +}
>
> Here, tmp is not released, and mst_list holds the words split out of msg.

FWIW, with this fixed, the tip of 'seen' passes the linux-leaks CI
job.

>  merge-ort.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git i/merge-ort.c w/merge-ort.c
> index 4cb92bdff8..cdb53770be 100644
> --- i/merge-ort.c
> +++ w/merge-ort.c
> @@ -4507,6 +4507,8 @@ static void format_submodule_conflict_suggestion(struct strbuf *msg) {
>  	}
>  	strbuf_reset(msg);
>  	strbuf_add(msg, tmp.buf, tmp.len);
> +	string_list_clear(&msg_list, 0);
> +	strbuf_release(&tmp);
>  }
>  
>  static void print_submodule_conflict_suggestion(struct string_list *csub) {