[vlc-commits] demux: avi: fix possible SIGSEGV when Open fails

Thomas Guillem git at videolan.org
Mon Nov 6 13:09:46 CET 2017


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Nov  6 13:07:09 2017 +0100| [a719d58995be53bf1f6bbcb64c2ac6aaa046b32c] | committer: Thomas Guillem

demux: avi: fix possible SIGSEGV when Open fails

This fixes a regression introduced by e1be5bcac0cf1f7e461d632a1ae1d7b8b3c9e0fd

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a719d58995be53bf1f6bbcb64c2ac6aaa046b32c
---

 modules/demux/avi/avi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index da0903f1c1..190a6be209 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -274,7 +274,8 @@ static void Close ( vlc_object_t * p_this )
     free( p_sys->track );
 
     AVI_ChunkFreeRoot( p_demux->s, &p_sys->ck_root );
-    vlc_meta_Delete( p_sys->meta );
+    if( p_sys->meta )
+        vlc_meta_Delete( p_sys->meta );
 
     for( unsigned i = 0; i < p_sys->i_attachment; i++)
         vlc_input_attachment_Delete(p_sys->attachment[i]);



More information about the vlc-commits mailing list