mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

libsolv: fix segfault when using SOLVER_DISFAVOR

Browse Source 
Opkg --add-ignore-recommends use the flag SOLVER_DISFAVOR. If a package
is set to be ignored as a recommendee, but there are not other
recommends on the package graph, libsolv segfaults.

(From OE-Core rev: d3ee06845e18ecf94770ff0970c2a0d6631ed214)

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alejandro del Castillo
2019-02-07 09:57:58 -06:00
committed by Richard Purdie
parent c76c50df64
commit df31968a4c
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meta/recipes-extended/libsolv/libsolv/0001-solver_solve-only-disfavor-recommends-if-there-are-a.patch Normal file
View File

@@ -0,0 +1,33 @@
From 19d7cc87adba92d31d5fafdf7db00920d24a96a6 Mon Sep 17 00:00:00 2001
From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Date: Wed, 6 Feb 2019 13:24:04 -0600
Subject: [PATCH] solver_solve: only disfavor recommends if there are any
In a repo that have pkg 'a' and 'b' available, and 'b' is disfavored,
but 'a' doesn't recommend 'b', libsolv segfaults on
solver_addrecommendsrules, since solv->recommendsruleq is null. Only
call solver_addrecommendsrules if there are recommends rules.
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Upstream-Status: Accepted
---
src/solver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/solver.c b/src/solver.c
index a80090d19..ad78327a8 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -3920,7 +3920,7 @@ solver_solve(Solver *solv, Queue *job)
else
solv->yumobsrules = solv->yumobsrules_end = solv->nrules;
- if (solv->havedisfavored && solv->strongrecommends)
+ if (solv->havedisfavored && solv->strongrecommends && solv->recommendsruleq)
solver_addrecommendsrules(solv);
else
solv->recommendsrules = solv->recommendsrules_end = solv->nrules;
--
2.20.1

4
meta/recipes-extended/libsolv/libsolv_0.7.3.bb
View File

@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
DEPENDS = "expat zlib"
SRC_URI = "git://github.com/openSUSE/libsolv.git"
SRC_URI = "git://github.com/openSUSE/libsolv.git \
file://0001-solver_solve-only-disfavor-recommends-if-there-are-a.patch \
"
SRCREV = "dc7d0f1c3113f2c8217563166906bef3eb5d1ee1"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"