# HG changeset patch # User bcoudurier # Date 1239502780 0 # Node ID 0929b70d44072c773a9380bfcde3578e79f9ea91 # Parent 4273f83dec05f015cadd8b7117e706aba2b7008c 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 diff -r 4273f83dec05 -r 0929b70d4407 mpegts.c --- a/mpegts.c Sun Apr 12 01:37:34 2009 +0000 +++ b/mpegts.c Sun Apr 12 02:19:40 2009 +0000 @@ -555,7 +555,7 @@ 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 @@ } } desc_len = get8(&p, desc_list_end); + if (desc_len < 0) + break; desc_end = p + desc_len; if (desc_end > desc_list_end) break;