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: Mon, 25 May 2020 11:20:55
Message-Id: 1590405449.650ad6f9415e229d3ac8680ca8f8c6c12a3f43c4.grobian@gentoo
1 commit: 650ad6f9415e229d3ac8680ca8f8c6c12a3f43c4
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 25 11:17:29 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon May 25 11:17:29 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=650ad6f9
7
8 qmerge: fix Coverity 210533
9
10 ensure todo != NULL when attempting to turn into a list
11
12 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
13
14 qmerge.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/qmerge.c b/qmerge.c
18 index 554e3dc..49c4b5d 100644
19 --- a/qmerge.c
20 +++ b/qmerge.c
21 @@ -1975,7 +1975,7 @@ qmerge_run(set *todo)
22 if (uninstall) {
23 return unmerge_packages(todo);
24 } else {
25 - if (todo == NULL && search_pkgs) {
26 + if (todo == NULL || search_pkgs) {
27 /* disputable, this should be qlist -kIv or something */
28 warn("please use qlist -kI");