Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
Date: Thu, 17 Dec 2015 05:06:28
Message-Id: 1450327518.dc82e50a316006d339eb0a4aa0d65a9502c41677.vapier@gentoo
1 commit: dc82e50a316006d339eb0a4aa0d65a9502c41677
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 17 04:45:18 2015 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 17 04:45:18 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=dc82e50a
7
8 cache: avoid memleak warnings
9
10 We leak a bit of memory when reinitializing the caches, but we don't care
11 because we'll be exiting soon after. Free the memory in debug builds.
12
13 main.c | 14 +++++++++-----
14 1 file changed, 9 insertions(+), 5 deletions(-)
15
16 diff --git a/main.c b/main.c
17 index c571ef7..d366bef 100644
18 --- a/main.c
19 +++ b/main.c
20 @@ -1071,15 +1071,19 @@ ret:
21 void reinitialize_as_needed(void)
22 {
23 size_t n;
24 - const char *overlay;
25 + const char *overlay, *ret = ret;
26
27 if (reinitialize)
28 - array_for_each(overlays, n, overlay)
29 - initialize_flat(overlay, CACHE_EBUILD, true);
30 + array_for_each(overlays, n, overlay) {
31 + ret = initialize_flat(overlay, CACHE_EBUILD, true);
32 + IF_DEBUG(free((void *)ret));
33 + }
34
35 if (reinitialize_metacache)
36 - array_for_each(overlays, n, overlay)
37 - initialize_flat(overlay, CACHE_METADATA, true);
38 + array_for_each(overlays, n, overlay) {
39 + ret = initialize_flat(overlay, CACHE_METADATA, true);
40 + IF_DEBUG(free((void *)ret));
41 + }
42 }
43
44 typedef struct {