Author: kwizart Update of /cvs/free/rpms/libdvbpsi/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21578 Modified Files: libdvbpsi.spec Added Files: libdvbpsi-calloc.patch Log Message: Backport patch libdvbpsi-calloc.patch: dr_50.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE libdvbpsi-calloc.patch --- From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman(a)videolan.org&gt; 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 Index: libdvbpsi.spec =================================================================== RCS file: /cvs/free/rpms/libdvbpsi/devel/libdvbpsi.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libdvbpsi.spec 26 Apr 2015 17:18:06 -0000 1.16 +++ libdvbpsi.spec 24 Oct 2015 11:07:43 -0000 1.17 @@ -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}%... Patch0: libdvbpsi-backport-werror_on_debug.patch +Patch1: libdvbpsi-calloc.patch BuildRequires: graphviz doxygen BuildRequires: libtool @@ -32,6 +33,7 @@ %prep %setup -q -n %{name}-%{version}%{?pre} %patch0 -p1 +%patch1 -p1 autoreconf -vif @@ -61,6 +63,9 @@ %changelog +* Sat Oct 24 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.2.0-3 +- backport patch - rfbz#3729 + * Sun Apr 26 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.2.0-2 - Backport patch to disable Werror - fix f22