[FFmpeg-cvslog] avcodec/dvdsub_parser: never return 0 when the input isnt 0

Michael Niedermayer git at videolan.org
Fri Nov 14 19:28:30 CET 2014


ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  2 00:27:23 2014 +0200| [8d48223a329a511a4d845df967e98e26c9a5bf53] | committer: Michael Niedermayer

avcodec/dvdsub_parser: never return 0 when the input isnt 0

Fixes a infinite loop
Fixes Ticket3804

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cfdb30d2f1241de9354a8efdbf8252d0f1a6f933)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/dvdsub_parser.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c
index e50c339..9a6457e 100644
--- a/libavcodec/dvdsub_parser.c
+++ b/libavcodec/dvdsub_parser.c
@@ -46,7 +46,7 @@ static int dvdsub_parse(AVCodecParserContext *s,
 
     if (pc->packet_index == 0) {
         if (buf_size < 2)
-            return 0;
+            return buf_size;
         pc->packet_len = AV_RB16(buf);
         if (pc->packet_len == 0) /* HD-DVD subpicture packet */
             pc->packet_len = AV_RB32(buf+2);



More information about the ffmpeg-cvslog mailing list