Browse Source

avformat/matroskaenc: Check BlockAdditional size before use

Don't read a 64bit number before having checked that the data is at
least 8 bytes long.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6e9cc96429)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
tags/n3.4.8
Andreas Rheinhardt 6 years ago
parent
commit
94ca3a00c8
1 changed files with 7 additions and 3 deletions
  1. +7
    -3
      libavformat/matroskaenc.c

+ 7
- 3
libavformat/matroskaenc.c View File

@@ -2169,9 +2169,13 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
&side_data_size);
if (side_data) {
additional_id = AV_RB64(side_data);
side_data += 8;
side_data_size -= 8;
if (side_data_size < 8) {
side_data_size = 0;
} else {
additional_id = AV_RB64(side_data);
side_data += 8;
side_data_size -= 8;
}
}

if ((side_data_size && additional_id == 1) || discard_padding) {


Loading…
Cancel
Save