diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2020-05-28 15:53:56 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-01 13:20:56 +0200 |
| commit | 550d70fde3bdca6469193f8ae4a7ff2d03c2467a (patch) | |
| tree | 1ff15a8fac92cecefa4d1d25674c4314ac83badf | |
| parent | f93ca3a2780727e7bde6d1e96ed5eca96b90a57d (diff) | |
| download | ffmpeg-550d70fde3bdca6469193f8ae4a7ff2d03c2467a.tar.gz | |
avcodec/vp9_superframe_split_bsf: Discard invalid zero-sized frames
They are invalid in VP9. If any of the frames inside a superframe
had a size of zero, the code would either read into the next frame
or into the superframe index; so check for the length to stop this.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
(cherry picked from commit d20ef30f534151ce749b064034c339562724cc34)
| -rw-r--r-- | libavcodec/vp9_superframe_split_bsf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp9_superframe_split_bsf.c b/libavcodec/vp9_superframe_split_bsf.c index ed0444561a..7f0cad1ea0 100644 --- a/libavcodec/vp9_superframe_split_bsf.c +++ b/libavcodec/vp9_superframe_split_bsf.c @@ -70,7 +70,7 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out) frame_size |= bytestream2_get_byte(&bc) << (j * 8); total_size += frame_size; - if (frame_size < 0 || total_size > in->size - idx_size) { + if (frame_size <= 0 || total_size > in->size - idx_size) { av_log(ctx, AV_LOG_ERROR, "Invalid frame size in a superframe: %d\n", frame_size); ret = AVERROR(EINVAL); |