Fix infinite loop

(cherry picked from commit e91f2120)

Fix infinite loop
(cherry picked from commit e91f2120)
96ac23c3 · Rafaël Carré · aa179ba8 · 96ac23c3
Commit 96ac23c3 authored Mar 29, 2008 by Rafaël Carré
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

modules/codec/ffmpeg/demux.c modules/codec/ffmpeg/demux.c +7 -2

No files found.
--- a/modules/codec/ffmpeg/demux.c
+++ b/modules/codec/ffmpeg/demux.c
@@ -489,8 +489,13 @@ static offset_t IOSeek( void *opaque, offset_t offset, int whence )
    }
    if( i_absolute < 0 )
        i_absolute = 0;
-    if( i_size && i_absolute > i_size )
+    if( i_size )
+    {
+        if( i_absolute > i_size )
            i_absolute = i_size;
+        if( stream_Tell( p_demux->s ) >= i_size )
+            return -1;
+    }

    if( stream_Seek( p_demux->s, i_absolute ) )
    {