From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6DD0C138334 for ; Sat, 8 Jun 2019 18:13:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CEA7E08D4; Sat, 8 Jun 2019 18:13:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 725BDE08D4 for ; Sat, 8 Jun 2019 18:13:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72EB5345A39 for ; Sat, 8 Jun 2019 18:13:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13B3361D for ; Sat, 8 Jun 2019 18:13:53 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1559930401.0c0ad25287d0f2c74c4fbfa7c72281f6169c72f7.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qlist.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 0c0ad25287d0f2c74c4fbfa7c72281f6169c72f7 X-VCS-Branch: master Date: Sat, 8 Jun 2019 18:13:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9a2e06d6-0345-40bf-bb53-c2d21b402064 X-Archives-Hash: dc2eddeeef5c1f7d096e0c2a07e3db05 commit: 0c0ad25287d0f2c74c4fbfa7c72281f6169c72f7 Author: Fabian Groffen gentoo org> AuthorDate: Fri Jun 7 18:00:01 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Jun 7 18:00:01 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=0c0ad252 qlist: fix crash in qlist_match when atom->SUBSLOT is absent when the query has a subslot, but the package in question doesn't, don't try to match it Signed-off-by: Fabian Groffen gentoo.org> qlist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qlist.c b/qlist.c index 52ae77d..0299d54 100644 --- a/qlist.c +++ b/qlist.c @@ -245,7 +245,8 @@ qlist_match( if (strcmp(atom->SLOT, uslot) != 0) return false; - if (usslot != NULL && strcmp(atom->SUBSLOT, usslot) != 0) + if (usslot != NULL && + (atom->SUBSLOT == NULL || strcmp(atom->SUBSLOT, usslot) != 0)) return false; }