ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Jul 27 18:03:53 2015 +0200| [c8c86b8f9b8c166633a7324c8646f38866801b88] | committer: Michael Niedermayer
avformat/mpegts: Replace silent cliping of language_count by asserts Failure should not be possible, if it does occur then the code is buggy and should be fixed not silently clip Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8c86b8f9b8c166633a7324c8646f38866801b88 --- libavformat/mpegts.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index b758ae3..6f4a47d 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1651,9 +1651,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type if (language_count > 0) { /* 4 bytes per language code (3 bytes) with comma or NUL byte should fit language buffer */ - if (language_count > sizeof(language) / 4) { - language_count = sizeof(language) / 4; - } + av_assert0(language_count <= sizeof(language) / 4); if (st->codec->extradata == NULL) { if (ff_alloc_extradata(st->codec, language_count * 2)) { @@ -1703,9 +1701,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type uint8_t *extradata; /* 4 bytes per language code (3 bytes) with comma or NUL byte should fit language buffer */ - if (language_count > sizeof(language) / 4) { - language_count = sizeof(language) / 4; - } + av_assert0(language_count <= sizeof(language) / 4); if (st->codec->extradata == NULL) { if (ff_alloc_extradata(st->codec, language_count * 5)) { _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
