]> git.sesse.net Git - vlc/commitdiff
Fix block_New failure check
authorRémi Denis-Courmont <rem@videolan.org>
Fri, 19 Jan 2007 19:49:40 +0000 (19:49 +0000)
committerRémi Denis-Courmont <rem@videolan.org>
Fri, 19 Jan 2007 19:49:40 +0000 (19:49 +0000)
include/vlc_block.h

index 5f1366efedf6e463b7d0562759ac8a4fd6e18361..0c82565094d421e27535c1905ad1d6aa20cd7ce7 100644 (file)
@@ -133,6 +133,8 @@ VLC_EXPORT( block_t *, block_Realloc,       ( block_t *, int i_pre, int i_body )
 static inline block_t *block_Duplicate( block_t *p_block )
 {
     block_t *p_dup = block_New( p_block->p_manager, p_block->i_buffer );
+    if( p_dup == NULL )
+        return NULL;
 
     p_dup->i_dts     = p_block->i_dts;
     p_dup->i_pts     = p_block->i_pts;
@@ -140,9 +142,7 @@ static inline block_t *block_Duplicate( block_t *p_block )
     p_dup->i_length  = p_block->i_length;
     p_dup->i_rate    = p_block->i_rate;
     p_dup->i_samples = p_block->i_samples;
-
-    if( p_dup && p_block->i_buffer > 0 )
-        memcpy( p_dup->p_buffer, p_block->p_buffer, p_block->i_buffer );
+    memcpy( p_dup->p_buffer, p_block->p_buffer, p_block->i_buffer );
 
     return p_dup;
 }