git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Jeff King" <peff@peff.net>
Subject: [PATCH v2 0/3] diff: build parseopts array on demand
Date: Thu, 1 Dec 2022 14:39:54 +0100	[thread overview]
Message-ID: <ea838ae7-b635-d4d2-d9df-e96b3d8980af@web.de> (raw)
In-Reply-To: <0620b4a6-b80a-d8a0-5a35-857b9fe0c986@web.de>

Calling repo_init_revisions() and release_revisions() in that order
leaks the memory allocated for the parseopts array in the embedded
struct diff_options member.  Get rid of that leak by reducing the
lifetime of that array.

Original patch:
https://lore.kernel.org/git/4fd82dc6-e0f8-0638-5b10-16bfef39a171@web.de/

Submitted separately from that thread because it's independent enough.

Change since v1:
- Actually remove the parseopts member.  Its removal got lost during
  refactoring in v1.  Thank you for spotting that, Junio!

  diff: factor out add_diff_options()
  diff: let prep_parse_options() return parseopt array
  diff: remove parseopts member from struct diff_options

 builtin/range-diff.c |  2 +-
 diff-no-index.c      |  3 +--
 diff.c               | 26 +++++++++++++++-----------
 diff.h               |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

Range-Diff gegen v1:
1:  630f95320f = 1:  4dc8b2632b diff: factor out add_diff_options()
2:  4b56fa795c = 2:  10903d355e diff: let prep_parse_options() return parseopt array
3:  7e54e4370a ! 3:  24bd18ae79 diff: remove parseopts member from struct diff_options
    @@ diff.c: void diff_free(struct diff_options *options)
      }

      void diff_flush(struct diff_options *options)
    +
    + ## diff.h ##
    +@@ diff.h: struct diff_options {
    + 	unsigned color_moved_ws_handling;
    +
    + 	struct repository *repo;
    +-	struct option *parseopts;
    + 	struct strmap *additional_path_headers;
    +
    + 	int no_free;
--
2.38.1

  parent reply	other threads:[~2022-12-01 13:40 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-30 18:01 [PATCH 0/3] diff: build parseopts array on demand René Scharfe
2022-11-30 18:03 ` [PATCH 1/3] diff: factor out add_diff_options() René Scharfe
2022-12-01 14:11   ` ZheNing Hu
2022-11-30 18:04 ` [PATCH 2/3] diff: let prep_parse_options() return parseopt array René Scharfe
2022-11-30 18:04 ` [PATCH 3/3] diff: remove parseopts member of struct diff_options René Scharfe
2022-12-01  1:25   ` Junio C Hamano
2022-12-01  7:52     ` René Scharfe
2022-12-01 21:56       ` Junio C Hamano
2022-12-01 22:45         ` René Scharfe
2022-12-01  1:02 ` [PATCH 0/3] diff: build parseopts array on demand Junio C Hamano
2022-12-01 13:39 ` René Scharfe [this message]
2022-12-01 13:42   ` [PATCH v2 1/3] diff: factor out add_diff_options() René Scharfe
2022-12-01 13:43   ` [PATCH v2 2/3] diff: let prep_parse_options() return parseopt array René Scharfe
2022-12-01 13:44   ` [PATCH v2 3/3] diff: remove parseopts member from struct diff_options René Scharfe
2022-12-01 16:54   ` [PATCH v2 0/3] diff: build parseopts array on demand Ævar Arnfjörð Bjarmason
2022-12-01 19:01     ` René Scharfe
2022-12-01 19:19       ` Eric Sunshine
2022-12-01 19:43         ` René Scharfe
2022-12-01 23:00       ` Ævar Arnfjörð Bjarmason
2022-12-01 22:45 ` [PATCH v3 " René Scharfe
2022-12-01 22:49   ` [PATCH v3 1/3] diff: factor out add_diff_options() René Scharfe
2022-12-01 22:51   ` [PATCH v3 2/3] diff: use add_diff_options() in diff_opt_parse() René Scharfe
2022-12-01 22:53   ` [PATCH v3 3/3] diff: remove parseopts member from struct diff_options René Scharfe

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=ea838ae7-b635-d4d2-d9df-e96b3d8980af@web.de \
    --to=l.s.r@web.de \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /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).