[vlc-commits] vlc_block: fix NULL dereference in block_ChainGather

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Mar 17 16:03:44 2015 +0100| [fbdacb6a0dbf418be6bbf5b7847cafd80b23296d] | committer: Francois Cartegnie

vlc_block: fix NULL dereference in block_ChainGather

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

 include/vlc_block.h |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/vlc_block.h b/include/vlc_block.h
index 34a107c..ba113d4 100644
--- 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;