diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-09-21 11:36:00 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-09-21 11:36:00 +0200 |
| commit | 79d8c05b7c382123dd04bd4dfb7ed7472d87c5d7 (patch) | |
| tree | 67990bc2484ee5f88cd27d38941c5620714b73d4 /main/vlc/CVE-2015-5949.patch | |
| parent | 5cf21c2970ede23199084dd6a552640c4fe708f6 (diff) | |
| download | aports-79d8c05b7c382123dd04bd4dfb7ed7472d87c5d7.tar.bz2 aports-79d8c05b7c382123dd04bd4dfb7ed7472d87c5d7.tar.xz | |
main/vlc: security fix for CVE-2015-5949
Diffstat (limited to 'main/vlc/CVE-2015-5949.patch')
| -rw-r--r-- | main/vlc/CVE-2015-5949.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/main/vlc/CVE-2015-5949.patch b/main/vlc/CVE-2015-5949.patch new file mode 100644 index 0000000000..751482c8ab --- /dev/null +++ b/main/vlc/CVE-2015-5949.patch @@ -0,0 +1,29 @@ +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 + |