[FFmpeg-cvslog] h264_mp4toannexb: Add a comment about possible overread

Andreas Rheinhardt git at videolan.org
Fri Mar 6 02:00:05 EET 2020

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Dec 14 23:19:17 2019 +0100| [015950596cdca08b692defedd56c5c4761e81749] | committer: Michael Niedermayer

h264_mp4toannexb: Add a comment about possible overread

Before reading a 16bit size field during parsing of extradata, no check
is performed to make sure that said length field is actually contained
in the extradata. Given that this overread is not dangerous (the extradata
is supposed to be padded), only a comment for it has been added; the error
itself will be detected as part of the normal check for overreads.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=015950596cdca08b692defedd56c5c4761e81749

 libavcodec/h264_mp4toannexb_bsf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c
index b9c6b165af..f809c6b3ad 100644
--- a/libavcodec/h264_mp4toannexb_bsf.c
+++ b/libavcodec/h264_mp4toannexb_bsf.c
@@ -98,6 +98,7 @@ static int h264_extradata_to_annexb(AVBSFContext *ctx, const int padding)
     while (unit_nb--) {
         int err;
+        /* possible overread ok due to padding */
         unit_size   = bytestream2_get_be16u(gb);
         total_size += unit_size + 4;
         av_assert1(total_size <= INT_MAX - padding);

More information about the ffmpeg-cvslog mailing list