summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2015-10-28 09:40:00 +0800
committerIan Delaney <idella4@gentoo.org>2015-10-28 09:43:01 +0800
commit512cacd39f22b2bfde6725f09d0f08ff37e8bbd6 (patch)
treea72deead16aad31d20af5d19be5e01178e0f90d2 /media-video/vlc/files
parentnet-analyzer/2ping: remove older versions. (diff)
downloadgentoo-512cacd39f22b2bfde6725f09d0f08ff37e8bbd6.tar.gz
gentoo-512cacd39f22b2bfde6725f09d0f08ff37e8bbd6.tar.bz2
gentoo-512cacd39f22b2bfde6725f09d0f08ff37e8bbd6.zip
media-video/vlc: revbump -> -2.2.1-r1, sec patch CVE-2015-5949
patch submitted by proxy maintainer via the gentoo bug, also runtested by Amynka, removed initial vlc-2.2.1.ebuild Gentoo bug: #558418 Package-Manager: portage-2.2.23
Diffstat (limited to 'media-video/vlc/files')
-rw-r--r--media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch
new file mode 100644
index 000000000000..83a52582a990
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch
@@ -0,0 +1,15 @@
+https://git.videolan.org/?p=vlc/vlc-2.2.git;a=commitdiff;h=ce91452460a75d7424b165c4dc8db98114c3cbd9;hp=9e12195d3e4316278af1fa4bcb6a705ff27456fd
+--- 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 ) )
+ {