Apply patch for NULL ptr deref in initial_state_start_fun

Thanks to Steve Grubb
This commit is contained in:
Alejandro Alvarez Ayllon 2020-08-04 09:12:44 +02:00
parent 0691598c72
commit 1e9ebe1f03
2 changed files with 29 additions and 2 deletions

View File

@ -0,0 +1,21 @@
diff -urp libmetalink-0.1.3.orig/lib/metalink_pstate.c libmetalink-0.1.3/lib/metalink_pstate.c
--- libmetalink-0.1.3.orig/lib/metalink_pstate.c 2012-08-12 04:43:53.000000000 -0400
+++ libmetalink-0.1.3/lib/metalink_pstate.c 2020-07-22 17:03:21.205852103 -0400
@@ -100,7 +100,7 @@ void initial_state_start_fun(metalink_ps
const char** attrs)
{
if(strcmp("metalink", name) == 0) {
- if (strcmp(METALINK_V3_NS_URI, ns_uri) == 0) {
+ if (ns_uri && strcmp(METALINK_V3_NS_URI, ns_uri) == 0) {
const char* type;
const char* origin;
metalink_pctrl_set_version(stm->ctrl, METALINK_VERSION_3);
@@ -116,7 +116,7 @@ void initial_state_start_fun(metalink_ps
metalink_pstm_enter_metalink_state(stm);
}
- else if (strcmp(METALINK_V4_NS_URI, ns_uri) == 0) {
+ else if (ns_uri && strcmp(METALINK_V4_NS_URI, ns_uri) == 0) {
metalink_pctrl_set_version(stm->ctrl, METALINK_VERSION_4);
metalink_pstm_enter_metalink_state_v4(stm);
} else {

View File

@ -1,10 +1,13 @@
Name: libmetalink
Version: 0.1.3
Release: 12%{?dist}
Release: 13%{?dist}
Summary: Metalink library written in C
License: MIT
URL: https://launchpad.net/libmetalink
Source0: https://launchpad.net/libmetalink/trunk/%{name}-%{version}/+download/%{name}-%{version}.tar.bz2
# https://bugs.launchpad.net/libmetalink/+bug/1888672
Patch0: libmetalink-0.1.3-ns_uri.patch
BuildRequires: gcc
BuildRequires: expat-devel
BuildRequires: CUnit-devel
@ -21,7 +24,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Files needed for building applications with libmetalink.
%prep
%setup -q
%autosetup -p1
%build
%configure --disable-static
@ -57,6 +60,9 @@ find $RPM_BUILD_ROOT -name *.la -exec rm {} \;
%changelog
* Tue Aug 04 2020 Alejandro Alvarez Ayllon <aalvarez@fedoraproject.org> - 0.1.3-13
- Apply patch fixing NULL ptr deref in initial_state_start_fun (#1860976)
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild