[FFmpeg-cvslog] avformat/vfq: fix deadlock in vqf_read_header()

Paul B Mahol git at videolan.org
Sat Sep 28 17:39:24 CEST 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Sep 28 15:36:54 2013 +0000| [07da0854fe98793b17a7125ff96c54b206e452a4] | committer: Paul B Mahol

avformat/vfq: fix deadlock in vqf_read_header()

Fixes #3010.
Reported-by: Piotr Bandurski <ami_stuff at o2.pl>
Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07da0854fe98793b17a7125ff96c54b206e452a4
---

 libavformat/vqf.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/vqf.c b/libavformat/vqf.c
index 1ce5359..83ec1be 100644
--- a/libavformat/vqf.c
+++ b/libavformat/vqf.c
@@ -163,7 +163,7 @@ static int vqf_read_header(AVFormatContext *s)
 
         header_size -= len;
 
-    } while (header_size >= 0);
+    } while (header_size >= 0 && !url_feof(s->pb));
 
     switch (rate_flag) {
     case -1:



More information about the ffmpeg-cvslog mailing list