[vlc-commits] demux: asf: do cleanup on failed init (fix #17995)

Francois Cartegnie git at videolan.org
Mon Apr 10 18:30:08 CEST 2017


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Apr 10 18:28:35 2017 +0200| [beaf1fe00749e37c2d7282a2bc3be39dfb15bd08] | committer: Francois Cartegnie

demux: asf: do cleanup on failed init (fix #17995)

also potential freed dereference on chained with
failed init

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

 modules/demux/asf/asf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index ccaeeb3d06..9b042ed567 100644
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -1345,7 +1345,7 @@ static int DemuxInit( demux_t *p_demux )
     return VLC_SUCCESS;
 
 error:
-    ASF_FreeObjectRoot( p_demux->s, p_sys->p_root );
+    DemuxEnd( p_demux );
     return VLC_EGENERIC;
 }
 



More information about the vlc-commits mailing list