vlc_block: fix NULL dereference in block_ChainGather

fbdacb6a · Francois Cartegnie · fc81c4e2 · fbdacb6a
Commit fbdacb6a authored Mar 17, 2015 by Francois Cartegnie
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

include/vlc_block.h include/vlc_block.h +2 -0

No files found.
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -278,6 +278,8 @@ static inline block_t *block_ChainGather( block_t *p_list )
    block_ChainProperties( p_list, NULL, &i_total, &i_length );

    g = block_Alloc( i_total );
+    if( !g )
+        return NULL;
    block_ChainExtract( p_list, g->p_buffer, g->i_buffer );

    g->i_flags = p_list->i_flags;