From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>
Subject: [PATCH v2 0/6] reroll ma/plugleaks; more `object_array`-fixes
Date: Sat, 23 Sep 2017 01:34:48 +0200 [thread overview]
Message-ID: <cover.1506120291.git.martin.agren@gmail.com> (raw)
In-Reply-To: <20170920200229.bc4yniz6otng2zyz@sigill.intra.peff.net>
On 20 September 2017 at 22:02, Jeff King <peff@peff.net> wrote:
> On Wed, Sep 20, 2017 at 09:47:24PM +0200, Martin Ågren wrote:
>
>> Instead of conditionally freeing `rev.pending.objects`, just call
>> `object_array_clear()` on `rev.pending`. This means we don't poke as
>> much into the implementation, which is already a good thing, but also
>> that we free the individual entries as well, thereby fixing a
>> memory-leak.
>
> Looks good. A similar bug was the exact reason for adding the function
> in 46be82312. I did a grep for 'free.*\.objects' to see if there were
> other cases.
>
> There are some hits. E.g., the one in orphaned_commit_warning(). It does
> something funny with setting revs.leak_pending. But I _think_ after the
> whole thing is done and we call free(refs.objects), that probably ought
> to be an object_array_clear().
Looking into this, I found various classes of leaks and oddities. I
ended up replacing this patch with four patches.
Since Junio collected my "independent" patches into ma/leakplugs, this
is a re-roll of that whole topic. I got the first two patches from
Junio's tree. The only difference there is "builtin/" at the very start
of the first commit message.
The third patch handles the places where we use `leak_pending`. The
fourth addresses the rest of what your grep found and includes the
original patch from this thread. While working on those, I felt that
some callers fiddle a bit too much with the internals of `object_array`.
One pattern leaks, another only looks like it. That resulted in the last
two patches.
Since ma/plugleaks is branched off maint, I did the same with this
series. It applies on master and next and has a minor conflict on pu
(`handle_commit()` got a new argument).
Martin
Martin Ågren (6):
builtin/commit: fix memory leak in `prepare_index()`
commit: fix memory leak in `reduce_heads()`
leak_pending: use `object_array_clear()`, not `free()`
object_array: use `object_array_clear()`, not `free()`
object_array: add and use `object_array_pop()`
pack-bitmap[-write]: use `object_array_clear()`, don't leak
bisect.c | 3 ++-
builtin/checkout.c | 9 ++++++++-
builtin/commit.c | 15 ++++++++++-----
builtin/fast-export.c | 3 +--
builtin/fsck.c | 7 +------
builtin/reflog.c | 6 +++---
bundle.c | 9 ++++++++-
commit.c | 1 +
diff-lib.c | 3 +--
object.c | 13 +++++++++++++
object.h | 7 +++++++
pack-bitmap-write.c | 4 +---
pack-bitmap.c | 10 +++-------
revision.h | 11 +++++++++++
shallow.c | 2 +-
submodule.c | 4 ++--
upload-pack.c | 2 +-
17 files changed, 74 insertions(+), 35 deletions(-)
--
2.14.1.727.g9ddaf86
next prev parent reply other threads:[~2017-09-22 23:35 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-20 19:47 [PATCH] diff-lib: clear `pending` object-array in `index_differs_from()` Martin Ågren
2017-09-20 20:02 ` Jeff King
2017-09-21 3:56 ` Martin Ågren
2017-09-21 4:52 ` Jeff King
2017-09-22 23:34 ` Martin Ågren [this message]
2017-09-22 23:34 ` [PATCH v2 1/6] builtin/commit: fix memory leak in `prepare_index()` Martin Ågren
2017-09-22 23:34 ` [PATCH v2 2/6] commit: fix memory leak in `reduce_heads()` Martin Ågren
2017-09-22 23:34 ` [PATCH v2 3/6] leak_pending: use `object_array_clear()`, not `free()` Martin Ågren
2017-09-23 3:47 ` Jeff King
2017-09-22 23:34 ` [PATCH v2 4/6] object_array: " Martin Ågren
2017-09-23 4:04 ` Jeff King
2017-09-23 9:41 ` Martin Ågren
2017-09-22 23:34 ` [PATCH v2 5/6] object_array: add and use `object_array_pop()` Martin Ågren
2017-09-23 4:27 ` Jeff King
2017-09-23 9:49 ` Martin Ågren
2017-09-23 15:47 ` Jeff King
2017-09-22 23:34 ` [PATCH v2 6/6] pack-bitmap[-write]: use `object_array_clear()`, don't leak Martin Ågren
2017-09-23 4:35 ` Jeff King
2017-09-23 4:37 ` [PATCH v2 0/6] reroll ma/plugleaks; more `object_array`-fixes Jeff King
2017-09-23 9:54 ` Martin Ågren
2017-09-23 16:13 ` Jeff King
2017-09-23 16:38 ` Jeff King
2017-09-24 19:59 ` Martin Ågren
2017-09-25 16:08 ` Jeff King
2017-10-01 15:04 ` Martin Ågren
2017-09-24 7:01 ` Junio C Hamano
2017-09-24 20:00 ` Martin Ågren
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=cover.1506120291.git.martin.agren@gmail.com \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--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).