git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Lidong Yan via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,  Lidong Yan <502024330056@smail.nju.edu.cn>
Subject: Re: [PATCH v4] mailinfo: fix pointential memory leak if `decode_header` failed
Date: Tue, 13 May 2025 06:34:21 -0700	[thread overview]
Message-ID: <xmqq4ixoiqhu.fsf@gitster.g> (raw)
In-Reply-To: <pull.1956.v4.git.git.1747104551204.gitgitgadget@gmail.com> (Lidong Yan via GitGitGadget's message of "Tue, 13 May 2025 02:49:10 +0000")

"Lidong Yan via GitGitGadget" <gitgitgadget@gmail.com> writes:

> -static struct strbuf *decode_q_segment(const struct strbuf *q_seg, int rfc2047)
> +static int decode_q_segment(struct strbuf *out, const struct strbuf *q_seg,
> +			    int rfc2047)
>  {
>  	const char *in = q_seg->buf;
>  	int c;
> -	struct strbuf *out = xmalloc(sizeof(struct strbuf));
> -	strbuf_init(out, q_seg->len);
> +	strbuf_grow(out, q_seg->len);

Call to grow(), while it does not hurt correctness, would not be
necessary here, but let's take this code as-is.  As the result of Q
encoding (and B encoding as well) always is longer than the decoded
result, strbuf_grow(out, q_seg->len) would always be over-allocating,
but it would not hurt too much.

> -static struct strbuf *decode_b_segment(const struct strbuf *b_seg)
> +static int decode_b_segment(struct strbuf *out, const struct strbuf *b_seg)
>  {
>  	/* Decode in..ep, possibly in-place to ot */
>  	int c, pos = 0, acc = 0;
>  	const char *in = b_seg->buf;
> -	struct strbuf *out = xmalloc(sizeof(struct strbuf));
> -	strbuf_init(out, b_seg->len);
> +	strbuf_grow(out, b_seg->len);

Ditto.

>  	char *in, *ep, *cp;
> -	struct strbuf outbuf = STRBUF_INIT, *dec;
> +	struct strbuf outbuf = STRBUF_INIT, dec = STRBUF_INIT;
>  	struct strbuf charset_q = STRBUF_INIT, piecebuf = STRBUF_INIT;
>  	int found_error = 1; /* pessimism */

The remainder of the patch also looks good.

Thanks.

  reply	other threads:[~2025-05-13 13:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-08 13:38 [PATCH] decode_header: fix pointential memory leak if decode_header failed Lidong Yan via GitGitGadget
2025-05-08 22:16 ` Junio C Hamano
2025-05-09  1:51   ` lidongyan
2025-05-11 16:14 ` [PATCH v2] mailinfo: fix pointential memory leak if `decode_header` failed Lidong Yan via GitGitGadget
2025-05-12 14:12   ` Junio C Hamano
2025-05-12 16:17   ` [PATCH v3] " Lidong Yan via GitGitGadget
2025-05-12 19:32     ` Junio C Hamano
2025-05-13  2:49     ` [PATCH v4] " Lidong Yan via GitGitGadget
2025-05-13 13:34       ` Junio C Hamano [this message]
2025-05-13 13:42         ` lidongyan

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=xmqq4ixoiqhu.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=502024330056@smail.nju.edu.cn \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@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).