[vlc-commits] dvdnav: Fix demux returning success in case or error

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Apr  9 12:55:56 2015 +0200| [d59b81a897c36b7d6227c5892d63b90d8febd786] | committer: Thomas Guillem

dvdnav: Fix demux returning success in case or error

It happened when StreamProbeDVD succeeded and when dvdnav_open_stream failed.

Fixes #14300

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

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

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 43fed80..236b970 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -445,7 +445,7 @@ static int DemuxOpen ( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t*)p_this;
     dvdnav_t *p_dvdnav = NULL;
-    int i_ret;
+    int i_ret = VLC_EGENERIC;
     int64_t i_init_pos;
     bool forced = false, b_seekable = false;
 
@@ -463,7 +463,7 @@ static int DemuxOpen ( vlc_object_t *p_this )
     i_init_pos = stream_Tell( p_demux->s );
 
     /* Try some simple probing to avoid going through dvdnav_open too often */
-    if( !forced && (i_ret = StreamProbeDVD( p_demux->s )) != VLC_SUCCESS )
+    if( !forced && StreamProbeDVD( p_demux->s ) != VLC_SUCCESS )
         goto bailout;
 
     static dvdnav_stream_cb stream_cb =