ports/contrib
3
3
Fork 2
Code Issues Pull Requests Activity

Merge branch '3.3' into 3.4

Browse Source
This commit is contained in:
Fredrik Rinnestam 2018-04-28 03:31:09 +02:00
commit c19a6da21d
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ffmpeg3/CVE-2018-6621.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/libavcodec/utvideodec.c 2017-12-11 05:35:09.000000000 +0800
+++ b/libavcodec/utvideodec.c 2018-02-06 15:54:54.872000000 +0800
@@ -561,7 +561,7 @@ static int decode_frame(AVCodecContext *
for (j = 0; j < c->slices; j++) {
slice_end = bytestream2_get_le32u(&gb);
if (slice_end < 0 || slice_end < slice_start ||
- bytestream2_get_bytes_left(&gb) < slice_end) {
+ bytestream2_get_bytes_left(&gb) < slice_end + 1024LL) {
av_log(avctx, AV_LOG_ERROR, "Incorrect slice size\n");
return AVERROR_INVALIDDATA;
}