]> git.sesse.net Git - vlc/commitdiff
Protect a few whiles againts possible broken decoder.
authorLaurent Aimar <fenrir@videolan.org>
Tue, 7 Oct 2008 18:00:15 +0000 (20:00 +0200)
committerLaurent Aimar <fenrir@videolan.org>
Wed, 8 Oct 2008 22:11:16 +0000 (00:11 +0200)
src/input/decoder.c

index ce7325803b1a85d51b2ee1b4b433e90efa1714ea..183d7db6dc6a92ad29d502f5c62cc1726b2e38fa 100644 (file)
@@ -339,7 +339,7 @@ void input_DecoderDecode( decoder_t * p_dec, block_t *p_block )
         if( p_owner->p_input->p->b_out_pace_control )
         {
             /* FIXME !!!!! */
-            while( !p_dec->b_die && !p_dec->b_error &&
+            while( vlc_object_alive( p_dec ) && !p_dec->b_error &&
                    block_FifoCount( p_owner->p_fifo ) > 10 )
             {
                 msleep( 1000 );
@@ -724,7 +724,7 @@ static void DecoderFlush( decoder_t *p_dec )
     /* */
     if( p_owner->b_own_thread )
     {
-        while( p_owner->b_flushing )
+        while( vlc_object_alive( p_dec ) && p_owner->b_flushing )
             vlc_cond_wait( &p_owner->wait, &p_owner->lock );
     }
 }