Browse code
Fix core dump caused by corrupt metadata (repomd.xml) (Bug 1948957)
Change-Id: I820f0d3b5875e5881247b2a206640c792069dd6f
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3776
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
xiaolin-vmware authored on 2017/09/15 10:11:34Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,13 @@ |
| 0 |
+diff --git a/src/sack.c b/src/sack.c |
|
| 1 |
+index 999392d..88ee750 100644 |
|
| 2 |
+--- a/src/sack.c |
|
| 3 |
+@@ -351,7 +351,7 @@ load_ext(HySack sack, HyRepo hrepo, int which_repodata, |
|
| 4 |
+ int previous_last = repo->nrepodata - 1; |
|
| 5 |
+ ret = cb(repo, fp); |
|
| 6 |
+ fclose(fp); |
|
| 7 |
+- assert(ret == 0); |
|
| 8 |
++ /* assert(ret == 0); */ |
|
| 9 |
+ if (ret == 0) {
|
|
| 10 |
+ repo_update_state(hrepo, which_repodata, _HY_LOADED_FETCH); |
|
| 11 |
+ assert(previous_last == repo->nrepodata - 2); (void)previous_last; |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: Hawkey |
| 5 | 5 |
Name: hawkey |
| 6 | 6 |
Version: 2017.1 |
| 7 |
-Release: 3%{?dist}
|
|
| 7 |
+Release: 4%{?dist}
|
|
| 8 | 8 |
License: LGPLv2+ |
| 9 | 9 |
URL: http://fedoraproject.org/wiki/Features/Hawkey |
| 10 | 10 |
Source0: https://github.com/rpm-software-management/hawkey/archive/%{name}-%{version}.tar.gz
|
| ... | ... |
@@ -12,6 +12,7 @@ Source0: https://github.com/rpm-software-management/hawkey/archive/%{name
|
| 12 | 12 |
Group: Development/Libraries |
| 13 | 13 |
Vendor: VMware, Inc. |
| 14 | 14 |
Distribution: Photon |
| 15 |
+Patch0: hawkey-corrupt-metadata.patch |
|
| 15 | 16 |
BuildRequires: libsolv-devel |
| 16 | 17 |
BuildRequires: check |
| 17 | 18 |
BuildRequires: cmake |
| ... | ... |
@@ -59,6 +60,7 @@ Python 3 bindings for the hawkey library. |
| 59 | 59 |
|
| 60 | 60 |
%prep |
| 61 | 61 |
%setup -qn hawkey-hawkey-0.6.4-1 |
| 62 |
+%patch0 -p1 |
|
| 62 | 63 |
sed -i 's/ADD_SUBDIRECTORY (doc)//' CMakeLists.txt |
| 63 | 64 |
mkdir build |
| 64 | 65 |
mkdir build-py3 |
| ... | ... |
@@ -114,6 +116,8 @@ popd |
| 114 | 114 |
%exclude %{python_sitearch}/*
|
| 115 | 115 |
|
| 116 | 116 |
%changelog |
| 117 |
+* Thu Sep 14 2017 Xiaolin Li <xiaolinl@vmware.com> 2017.1-4 |
|
| 118 |
+- Fix core dump caused by corrupt metadata (repomd.xml). |
|
| 117 | 119 |
* Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 2017.1-3 |
| 118 | 120 |
- Fix check issues. |
| 119 | 121 |
* Mon May 22 2017 Xiaolin Li <xiaolinl@vmware.com> 2017.1-2 |