demux: mp4: don't NULL dereference on failed realloc

diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 10fd8caba3eed992de13665ebc241272ab4f2350..e507eb47f7fc7d8a923fd18118621ab6082fd541 100644 (file)
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -721,7 +721,8 @@ static int Mux(sout_mux_t *p_mux)
 static block_t *ConvertSUBT(block_t *p_block)
 {
     p_block = block_Realloc(p_block, 2, p_block->i_buffer);
-
+    if( !p_block )
+        return NULL;
     /* No trailling '\0' */
     if (p_block->i_buffer > 2 && p_block->p_buffer[p_block->i_buffer-1] == '\0')
         p_block->i_buffer--;
@@ -2836,6 +2837,9 @@ static int MuxFrag(sout_mux_t *p_mux)
         break;
     }
 
+    if( !p_currentblock )
+        return VLC_ENOMEM;
+
     /* If we have a previous entry for outgoing queue */
     if (p_stream->p_held_entry)
     {