demux: libmp4: don't return empty root

4efdadf6 · François Cartegnie · 408d124b · 4efdadf6
Commit 4efdadf6 authored May 05, 2017 by François Cartegnie 🤞
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

modules/demux/mp4/libmp4.c modules/demux/mp4/libmp4.c +6 -1

No files found.
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -4664,7 +4664,12 @@ MP4_Box_t *MP4_BoxGetNextChunk( stream_t *s )
    MP4_ReadBoxContainerChildren( s, p_fakeroot, stoplist );
    p_tmp_box = p_fakeroot->p_first;
-    while( p_tmp_box )
+    if( p_tmp_box == NULL )
+    {
+        MP4_BoxFree( p_fakeroot );
+        return NULL;
+    }
+    else while( p_tmp_box )
    {
        p_fakeroot->i_size += p_tmp_box->i_size;
        p_tmp_box = p_tmp_box->p_next;