[vlc-commits] bluray: fix invalid argument crash for error paths in open

David Fuhrmann git at videolan.org
Tue Mar 18 15:38:53 CET 2014


vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Tue Mar 18 15:38:13 2014 +0100| [24811d4d8410875964273062b68c4c419359e977] | committer: David Fuhrmann

bluray: fix invalid argument crash for error paths in open

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

 modules/access/bluray.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index df3c922..2c1a0ce 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -339,6 +339,8 @@ static int blurayOpen(vlc_object_t *object)
         return VLC_EGENERIC;
     }
 
+    vlc_mutex_init(&p_sys->pl_info_lock);
+
     /* Warning the user about AACS/BD+ */
     const BLURAY_DISC_INFO *disc_info = bd_get_disc_info(p_sys->bluray);
 
@@ -454,8 +456,6 @@ static int blurayOpen(vlc_object_t *object)
         goto error;
     }
 
-    vlc_mutex_init(&p_sys->pl_info_lock);
-
     p_demux->pf_control = blurayControl;
     p_demux->pf_demux   = blurayDemux;
 



More information about the vlc-commits mailing list