[FFmpeg-cvslog] r18455 - trunk/libavformat/mpegts.c

[bcoudurier]

Author: bcoudurier
Date: Sun Apr 12 04:19:40 2009
New Revision: 18455

Log:
Ok, ts demuxer is more complicated than I thought
Revert r18454 and fix correctly #700
Stop parsing if end of buffer is reached while reading
patch by Bj?rn Axelsson, bjorn dot axelsson at intinor dot se

Modified:
   trunk/libavformat/mpegts.c

Modified: trunk/libavformat/mpegts.c
==============================================================================
--- trunk/libavformat/mpegts.c	Sun Apr 12 03:37:34 2009	(r18454)
+++ trunk/libavformat/mpegts.c	Sun Apr 12 04:19:40 2009	(r18455)
@@ -555,7 +555,7 @@ static void pmt_cb(MpegTSFilter *filter,
         if (desc_list_len < 0)
             break;
         desc_list_end = p + desc_list_len;
-        if (desc_list_end >= p_end)
+        if (desc_list_end > p_end)
             break;
         for(;;) {
             desc_tag = get8(&p, desc_list_end);
@@ -571,6 +571,8 @@ static void pmt_cb(MpegTSFilter *filter,
                 }
             }
             desc_len = get8(&p, desc_list_end);
+            if (desc_len < 0)
+                break;
             desc_end = p + desc_len;
             if (desc_end > desc_list_end)
                 break;