vlc | branch: master | Denis Charmet <[email protected]> | Fri Feb 17 17:44:44 
2012 +0100| [934582e46d03f2acdb39b170b161856c42db61b7] | committer: 
Jean-Baptiste Kempf

Avoid a crash if there are duplicated files in dir

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

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

 modules/demux/mkv/demux.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index f63d352..658dc31 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -528,10 +528,10 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( 
demux_t *p_demux, EbmlS
                         {
                             KaxSegmentUID *p_uid = 
static_cast<KaxSegmentUID*>(l);
                             b_keep_segment = (FindSegment( *p_uid ) == NULL);
-                            if ( !b_keep_segment )
-                                break; // this segment is already known
                             delete p_segment1->p_segment_uid;
                             p_segment1->p_segment_uid = new 
KaxSegmentUID(*p_uid);
+                            if ( !b_keep_segment )
+                                break; // this segment is already known
                         }
                         else if( MKV_IS_ID( l, KaxPrevUID ) )
                         {

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to