[vlc-commits] vorbis: fix dereference after null check (cid #403019)

2014-08-10 Thread Tristan Matthews 
vlc/vlc-2.2 | branch: master | Tristan Matthews le.business...@gmail.com | 
Sat Aug  9 21:02:00 2014 -0400| [1feb0545d9a67f247a46fe1db31b7f422771887c] | 
committer: Jean-Baptiste Kempf

vorbis: fix dereference after null check (cid #403019)

(cherry picked from commit 4941746e6379c43d56fc70ad5a7ad83d99081b2b)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=1feb0545d9a67f247a46fe1db31b7f422771887c
---

 modules/codec/vorbis.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 53b2c60..077a1c3 100644
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -318,7 +318,8 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t 
**pp_block )
 {
 if( ProcessHeaders( p_dec ) )
 {
-block_Release( *pp_block );
+if( *pp_block )
+block_Release( *pp_block );
 return NULL;
 }
 p_sys-b_has_headers = true;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vorbis: fix dereference after null check (cid #403019)

2014-08-09 Thread Tristan Matthews 
vlc | branch: master | Tristan Matthews le.business...@gmail.com | Sat Aug  9 
21:02:00 2014 -0400| [4941746e6379c43d56fc70ad5a7ad83d99081b2b] | committer: 
Tristan Matthews

vorbis: fix dereference after null check (cid #403019)

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

 modules/codec/vorbis.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 53b2c60..077a1c3 100644
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -318,7 +318,8 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t 
**pp_block )
 {
 if( ProcessHeaders( p_dec ) )
 {
-block_Release( *pp_block );
+if( *pp_block )
+block_Release( *pp_block );
 return NULL;
 }
 p_sys-b_has_headers = true;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits