]> git.sesse.net Git - vlc/commitdiff
opus: avoid NULL pointer dereference
authorTristan Matthews <le.businessman@gmail.com>
Wed, 4 Dec 2013 14:34:00 +0000 (09:34 -0500)
committerTristan Matthews <le.businessman@gmail.com>
Wed, 4 Dec 2013 14:38:37 +0000 (09:38 -0500)
modules/codec/opus.c

index de6e3d09c2e55b9df0332b70cdf3d7f6c35d17c4..32c0165d2d1a203985acd3927e160006ce2e85a9 100644 (file)
@@ -360,14 +360,15 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
 
     *pp_block = NULL; /* To avoid being fed the same packet again */
 
-    {
-        block_t *p_aout_buffer = DecodePacket( p_dec, p_oggpacket,
-                                               p_block->i_nb_samples,
-                                               (int)p_block->i_length );
+    if( !p_block )
+        return NULL;
 
-        block_Release( p_block );
-        return p_aout_buffer;
-    }
+    block_t *p_aout_buffer = DecodePacket( p_dec, p_oggpacket,
+                                           p_block->i_nb_samples,
+                                           (int)p_block->i_length );
+
+    block_Release( p_block );
+    return p_aout_buffer;
 }
 
 /*****************************************************************************