diff --git a/libdvbpsi-calloc.patch b/libdvbpsi-calloc.patch new file mode 100644 index 0000000..7000bbc --- /dev/null +++ b/libdvbpsi-calloc.patch @@ -0,0 +1,24 @@ +From 5058ea22730a67f03dd253dce89d513bc430bfb6 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= +Date: Fri, 5 Sep 2014 12:11:49 +0200 +Subject: [PATCH] dr_50: fix off-by-6 + +--- + src/descriptors/dr_50.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/descriptors/dr_50.c b/src/descriptors/dr_50.c +index a2e491c..9933b08 100644 +--- a/src/descriptors/dr_50.c ++++ b/src/descriptors/dr_50.c +@@ -70,7 +70,7 @@ dvbpsi_component_dr_t* dvbpsi_DecodeComponentDr(dvbpsi_descriptor_t * p_descript + if (p_descriptor->i_length > 6) + { + p_decoded->i_text_length = p_descriptor->i_length - 6; +- p_decoded->i_text = calloc(p_decoded->i_text_length - 6, sizeof(uint8_t)); ++ p_decoded->i_text = calloc(1, p_decoded->i_text_length); + if (!p_decoded->i_text) + { + free(p_decoded); +-- +1.7.10.4 diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 54d182d..f7d6050 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -4,12 +4,13 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.2.0 -Release: 2%{?pre}%{?dist} +Release: 3%{?pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 Patch0: libdvbpsi-backport-werror_on_debug.patch +Patch1: libdvbpsi-calloc.patch BuildRequires: graphviz doxygen BuildRequires: libtool @@ -32,6 +33,7 @@ This package contains development files for %{name} %prep %setup -q -n %{name}-%{version}%{?pre} %patch0 -p1 +%patch1 -p1 autoreconf -vif @@ -61,6 +63,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %changelog +* Sat Oct 24 2015 Nicolas Chauvet - 1.2.0-3 +- backport patch - rfbz#3729 + * Sun Apr 26 2015 Nicolas Chauvet - 1.2.0-2 - Backport patch to disable Werror - fix f22