Commit 2ef4b5ef authored by David Flynn's avatar David Flynn Committed by Rémi Denis-Courmont

codec/schroedinger: fix segfault when schro_decoder_pull returns NULL

Signed-off-by: default avatarDavid Flynn <davidf@rd.bbc.co.uk>
Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 999e1c36
...@@ -358,12 +358,12 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -358,12 +358,12 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
case SCHRO_DECODER_OK: { case SCHRO_DECODER_OK: {
SchroTag *p_tag = schro_decoder_get_picture_tag( p_sys->p_schro ); SchroTag *p_tag = schro_decoder_get_picture_tag( p_sys->p_schro );
p_schroframe = schro_decoder_pull( p_sys->p_schro ); p_schroframe = schro_decoder_pull( p_sys->p_schro );
if( !p_schroframe->priv ) if( !p_schroframe || !p_schroframe->priv )
{ {
/* frame can't be one that was allocated by us /* frame can't be one that was allocated by us
* -- no private data: discard */ * -- no private data: discard */
if( p_tag ) schro_tag_free( p_tag ); if( p_tag ) schro_tag_free( p_tag );
schro_frame_unref( p_schroframe ); if( p_schroframe ) schro_frame_unref( p_schroframe );
break; break;
} }
p_pic = ((struct picture_free_t*) p_schroframe->priv)->p_pic; p_pic = ((struct picture_free_t*) p_schroframe->priv)->p_pic;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment