Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
Date: Thu, 01 Jul 2021 10:07:35
Message-Id: 1625134044.3b1e1439445bb6694d2075043a1ecc2f1a323e7c.grobian@gentoo
1 commit: 3b1e1439445bb6694d2075043a1ecc2f1a323e7c
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 1 10:07:24 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 1 10:07:24 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3b1e1439
7
8 qmerge: avoid crash when there are no objects
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 qmerge.c | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15 diff --git a/qmerge.c b/qmerge.c
16 index bf8dc21..9cbcc45 100644
17 --- a/qmerge.c
18 +++ b/qmerge.c
19 @@ -1485,7 +1485,8 @@ pkg_merge(int level, const depend_atom *qatom, const tree_match_ctx *mpkg)
20 freeargv(cpm_argc, cpm_argv);
21
22 /* Clean up the package state */
23 - free_set(objs);
24 + if (objs != NULL)
25 + free_set(objs);
26 free(D);
27 free(T);