[vlc-commits] dvdread: fix use after free on error (refs #6594)

Rémi Denis-Courmont git at videolan.org
Mon Apr 9 22:07:56 CEST 2012


vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Apr  9 22:59:54 2012 +0300| [f5afdc3aed13dd2542e3013fb5335d6454676af3] | committer: Rémi Denis-Courmont

dvdread: fix use after free on error (refs #6594)

(cherry picked from commit 9ad094db2b47d5b57f5f8ac53c4a2848b3bffac7)

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

 modules/access/dvdread.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index af93fb3..61dc159 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -248,9 +248,9 @@ static int Open( vlc_object_t *p_this )
     DemuxTitles( p_demux, &p_sys->i_angle );
     if( DvdReadSetArea( p_demux, 0, 0, p_sys->i_angle ) != VLC_SUCCESS )
     {
-        Close( p_this );
         msg_Err( p_demux, "DvdReadSetArea(0,0,%i) failed (can't decrypt DVD?)",
                  p_sys->i_angle );
+        Close( p_this );
         return VLC_EGENERIC;
     }
 



More information about the vlc-commits mailing list