rpm/vlc
SHA256
1
0
Fork 0
forked from pool/vlc
Code Pull Requests Activity

Updating link to change in openSUSE:Factory/vlc revision 50.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=24b196f75fcd0c291e92b5bd07501343
This commit is contained in:
OBS User buildservice-autocommit
2016-02-08 08:47:56 +00:00
committed by Git OBS Bridge
parent 39b5beb658
commit 095fa447e2
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
vlc-CVE-2015-5949.patch Normal file
View File

@@ -0,0 +1,30 @@
From ce91452460a75d7424b165c4dc8db98114c3cbd9 Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcartegnie@free.fr>
Date: Mon, 3 Aug 2015 15:17:32 +0200
Subject: [PATCH 1/1] demux: mp4: correctly match release function
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
modules/demux/mp4/libmp4.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 331262b..f220e51 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
{
for( i_index = 0; ; i_index++ )
{
+ if ( MP4_Box_Function[i_index].i_parent &&
+ p_box->p_father &&
+ p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent )
+ continue;
+
if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
( MP4_Box_Function[i_index].i_type == 0 ) )
{
--
1.7.10.4

3
vlc.spec
View File

@@ -45,6 +45,8 @@ Source2: %{name}-rpmlintrc
Patch1: vlc-2.1.5-fix-skins2-default-skin-creation.patch
Patch3: 0001-no-return-in-non-void.patch
Patch4: vlc-2.2.0-fix_deinterlace_mmx.patch
# PATCH-FIX-UPSTREAM vlc-CVE-2015-5949.patch boo#965227 CVE-2015-5949 dimstar@opensuse.org -- demux: mp4: correctly match release function
Patch5: vlc-CVE-2015-5949.patch
BuildRequires: Mesa-devel
BuildRequires: SDL-devel >= 1.2.10
BuildRequires: aalib-devel
@@ -310,6 +312,7 @@ date
%patch4
%endif
%endif
%patch5 -p1
### Fix up sources for LUA 5.3
if pkg-config --atleast-version 5.3 lua; then