From ce799fe39b9e9d34c1d2dd3421fe9a3b655e30aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 5 Feb 2015 20:36:18 +0200 Subject: [PATCH] pva: missing checks for I/O error --- modules/demux/pva.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/modules/demux/pva.c b/modules/demux/pva.c index 0608644745..4c9db0e480 100644 --- a/modules/demux/pva.c +++ b/modules/demux/pva.c @@ -349,33 +349,30 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) *****************************************************************************/ static int ReSynch( demux_t *p_demux ) { - const uint8_t *p_peek; - int i_skip; - int i_peek; - - while( vlc_object_alive (p_demux) ) + for( ;; ) { - if( ( i_peek = stream_Peek( p_demux->s, &p_peek, 1024 ) ) < 8 ) - { - return VLC_EGENERIC; - } - i_skip = 0; + const uint8_t *p_peek; + int i_peek = stream_Peek( p_demux->s, &p_peek, 1024 ); + if( i_peek < 8 ) + break; + + int i_skip = 0; while( i_skip < i_peek - 5 ) { if( p_peek[0] == 'A' && p_peek[1] == 'V' && p_peek[4] == 0x55 ) { - if( i_skip > 0 ) - { - stream_Read( p_demux->s, NULL, i_skip ); - } + if( i_skip > 0 + && stream_Read( p_demux->s, NULL, i_skip ) < i_skip ) + return VLC_EGENERIC; return VLC_SUCCESS; } p_peek++; i_skip++; } - stream_Read( p_demux->s, NULL, i_skip ); + if( stream_Read( p_demux->s, NULL, i_skip ) < i_skip ) + break; } return VLC_EGENERIC; -- 2.39.2