[vlc-commits] demux: mkv: unchecked return

Francois Cartegnie git at videolan.org
Thu Dec 31 00:00:11 CET 2015


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Dec 30 23:05:47 2015 +0100| [5a95c543c9f400f43cd1cb2f3e022dd9cbb26927] | committer: Francois Cartegnie

demux: mkv: unchecked return

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

 modules/demux/mkv/matroska_segment.cpp |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index f29c580..16231f6 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -1253,6 +1253,8 @@ void matroska_segment_c::EnsureDuration()
                              var_InheritBool( &sys.demuxer, "mkv-use-dummy" ) );
 
         KaxCluster *p_last_cluster = (KaxCluster *) ep->Get();
+        if( p_last_cluster == NULL )
+            return;
         ParseCluster( p_last_cluster, false, SCOPE_PARTIAL_DATA );
 
         // use the last block + duration



More information about the vlc-commits mailing list