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

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

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=720d611906044f3e2d17d062c140582f
This commit is contained in:
OBS User buildservice-autocommit 2021-01-18 10:27:45 +00:00 committed by Git OBS Bridge
parent 7bea4db013
commit 13a2ceef16
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vlc-CVE-2020-26664.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
index 38a62aa2af2ca8462eedfda25608543d1bd9eec6..fa9a1e81a5994a487ec846fed6d8c9a2cec3139e 100644
--- a/modules/demux/mkv/mkv.hpp
+++ b/modules/demux/mkv/mkv.hpp
@@ -113,7 +113,7 @@ enum
#define MKVD_TIMECODESCALE 1000000
-#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) )
+#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) && !el->IsDummy() )
#define MKV_CHECKED_PTR_DECL( name, type, src ) type * name = MKV_IS_ID(src, type) ? static_cast<type*>(src) : NULL
#define MKV_CHECKED_PTR_DECL_CONST( name, type, src ) const type * name = MKV_IS_ID(src, type) ? static_cast<const type*>(src) : NULL

7
vlc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 14 15:58:51 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Add vlc-CVE-2020-26664.patch: mkv: Ensure we don't use an
EbmlDummy element for something it's not (CVE-2020-26664,
boo#1180755).
-------------------------------------------------------------------
Tue Dec 15 10:53:27 UTC 2020 - Martin Liška <mliska@suse.cz>

5
vlc.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package vlc
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands
#
# All modifications and additions to the file contributed by third parties
@ -51,6 +51,8 @@ Patch1: vlc-allow-deprecated-fribidi.patch
Patch2: vlc-lua-5.3.patch
# PATCH-FIX-UPSTREAM fix-build-with-fdk-2.0.patch -- Fix building vlc with libfdk-aac v2
Patch3: fix-build-with-fdk-2.0.patch
# PATCH-FIX-UPSTREAM vlc-CVE-2020-26664.patch CVE-2020-26664 dimstar@opensuse.org -- mkv: Ensure we don't use an EbmlDummy element for something it's not
Patch4: vlc-CVE-2020-26664.patch
# PATCH-FEATURE-OPENSUSE vlc-projectM-qt5.patch -- Build against projectM-qt5; openSUSE provides projectM as -qt and -qt5 variant
Patch100: vlc-projectM-qt5.patch
# PATCH-FIX-UPSTREAM -- Use OpenCV C++ API
@ -400,6 +402,7 @@ OpenCV based video filters and a face detection example.
%patch0 -p1
%patch1 -p1
%patch3 -p1
%patch4 -p1
%if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
%patch100 -p1
%endif