ensure duplinvolvedmap_all is reset
This commit is contained in:
parent
1cccbefdb8
commit
5304a22960
30
ensure-duplinvolvedmap_all-is-reset.patch
Normal file
30
ensure-duplinvolvedmap_all-is-reset.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
From dd6e977782816e330a8f60cf78ca3d12fead3b10 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jon Turney <jon.turney@dronecode.org.uk>
|
||||||
|
Date: Sun, 14 Aug 2022 18:45:20 +0100
|
||||||
|
Subject: [PATCH] Ensure duplinvolvedmap_all is reset when a solver is reused
|
||||||
|
|
||||||
|
Otherwise, if solver is used with a SOLVER_DISTUPGRADE job, then reused
|
||||||
|
without one, this will cause solver_addduprules() to be called, even
|
||||||
|
though needduprules is 0, which will crash trying to dereference
|
||||||
|
solv->dupmap, which is NULL because solver_createdupmaps() hasn't been
|
||||||
|
called.
|
||||||
|
|
||||||
|
Conflict:NA
|
||||||
|
Reference:https://github.com/openSUSE/libsolv/commit/dd6e977782816e330a8f60cf78ca3d12fead3b10
|
||||||
|
|
||||||
|
---
|
||||||
|
src/solver.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/src/solver.c b/src/solver.c
|
||||||
|
index 28341d6d3..e3779e232 100644
|
||||||
|
--- a/src/solver.c
|
||||||
|
+++ b/src/solver.c
|
||||||
|
@@ -3533,6 +3533,7 @@ solver_solve(Solver *solv, Queue *job)
|
||||||
|
map_zerosize(&solv->bestupdatemap);
|
||||||
|
solv->fixmap_all = 0;
|
||||||
|
map_zerosize(&solv->fixmap);
|
||||||
|
+ solv->dupinvolvedmap_all = 0;
|
||||||
|
map_zerosize(&solv->dupmap);
|
||||||
|
map_zerosize(&solv->dupinvolvedmap);
|
||||||
|
solv->process_orphans = 0;
|
||||||
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
Name: libsolv
|
Name: libsolv
|
||||||
Version: 0.7.20
|
Version: 0.7.20
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Package dependency solver
|
Summary: Package dependency solver
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://github.com/openSUSE/libsolv
|
URL: https://github.com/openSUSE/libsolv
|
||||||
@ -23,6 +23,7 @@ Source: https://github.com/openSUSE/libsolv/archive/refs/tags/%{v
|
|||||||
|
|
||||||
Patch0: Fix-segfault-on-conflict-resolution-when-using-bindi.patch
|
Patch0: Fix-segfault-on-conflict-resolution-when-using-bindi.patch
|
||||||
Patch1: Fix-memory-leak-when-using-testsolv-to-execute-cases.patch
|
Patch1: Fix-memory-leak-when-using-testsolv-to-execute-cases.patch
|
||||||
|
Patch2: ensure-duplinvolvedmap_all-is-reset.patch
|
||||||
|
|
||||||
BuildRequires: cmake gcc-c++ ninja-build pkgconfig(rpm) zlib-devel
|
BuildRequires: cmake gcc-c++ ninja-build pkgconfig(rpm) zlib-devel
|
||||||
BuildRequires: libxml2-devel xz-devel bzip2-devel
|
BuildRequires: libxml2-devel xz-devel bzip2-devel
|
||||||
@ -216,6 +217,12 @@ Python 3 version.
|
|||||||
%{_mandir}/man3/%{name}*.3*
|
%{_mandir}/man3/%{name}*.3*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 21 2022 hanhuihui<hanhuihui5@huawei.com> - 0.7.20-3
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:ensure-duplinvolvedmap_all-is-reset.patch
|
||||||
|
|
||||||
* Tue Oct 11 2022 zhangjun<zhangjun@kylinos.cn> - 0.7.20-2
|
* Tue Oct 11 2022 zhangjun<zhangjun@kylinos.cn> - 0.7.20-2
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user