diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-12-03 18:09:08 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-12-04 23:11:37 -0300 |
| commit | f74eaa17bb0b2a5a7d550c107cd119da87c946bc (patch) | |
| tree | a71b01cc948683fba93f7e57b264a63c61a70855 | |
| parent | a69f92a94638984cfc1203a43184e662365ab953 (diff) | |
| download | ffmpeg-f74eaa17bb0b2a5a7d550c107cd119da87c946bc.tar.gz | |
avformat/matroskadec: Remove unnecessary check
870e7552 introduced validating the lace sizes when they are parsed and
removed the old check; yet when merging this libav commit in 6902c3ac,
the old check for whether the frame extends beyond the frame has been kept.
It is unnecessary and has been removed.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/matroskadec.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 88c43ee0c1..595d9553a2 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2989,10 +2989,10 @@ static void matroska_clear_queue(MatroskaDemuxContext *matroska) } static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, - int *buf_size, int type, + int size, int type, uint32_t lace_size[256], int *laces) { - int n, size = *buf_size; + int n; uint8_t *data = *buf; if (!type) { @@ -3079,7 +3079,6 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, } *buf = data; - *buf_size = size; return 0; } @@ -3574,7 +3573,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf } } - res = matroska_parse_laces(matroska, &data, &size, (flags & 0x06) >> 1, + res = matroska_parse_laces(matroska, &data, size, (flags & 0x06) >> 1, lace_size, &laces); if (res < 0) return res; @@ -3597,11 +3596,6 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf for (n = 0; n < laces; n++) { int64_t lace_duration = block_duration*(n+1) / laces - block_duration*n / laces; - if (lace_size[n] > size) { - av_log(matroska->ctx, AV_LOG_ERROR, "Invalid packet size\n"); - break; - } - if ((st->codecpar->codec_id == AV_CODEC_ID_RA_288 || st->codecpar->codec_id == AV_CODEC_ID_COOK || st->codecpar->codec_id == AV_CODEC_ID_SIPR || @@ -3633,7 +3627,6 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf if (timecode != AV_NOPTS_VALUE) timecode = lace_duration ? timecode + lace_duration : AV_NOPTS_VALUE; data += lace_size[n]; - size -= lace_size[n]; } return 0; |