From: Rémi Denis-Courmont <rem@videolan.org>
Date: Fri, 19 Jan 2007 19:49:40 +0000 (+0000)
Subject: Fix block_New failure check
X-Git-Tag: 0.9.0-test0~8798
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1ceb58c19ce8b166b590a5118c60b652429b68a0;p=vlc

Fix block_New failure check
---

diff --git a/include/vlc_block.h b/include/vlc_block.h
index 5f1366efed..0c82565094 100644
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -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;
 }