From patchwork Sun Dec 23 18:24:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 11531 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5A94A44C60B for ; Sun, 23 Dec 2018 20:27:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 162D468B08A; Sun, 23 Dec 2018 20:27:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-2.mx.upcmail.net (vie01a-dmta-pe08-2.mx.upcmail.net [84.116.36.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BB1268A8BD for ; Sun, 23 Dec 2018 20:27:48 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1gb8Tg-000899-0h for ffmpeg-devel@ffmpeg.org; Sun, 23 Dec 2018 19:27:52 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id b8R8g4ZzS2WSsb8R8gsr09; Sun, 23 Dec 2018 19:25:14 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=E7kcWpVl c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=N7X0HC-XMjggSKMbWSkA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 23 Dec 2018 19:24:50 +0100 Message-Id: <20181223182450.26476-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181223182450.26476-1-michael@niedermayer.cc> References: <20181223182450.26476-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfF2r3sa6HxZ6+i9NqGl8e73l2fVgMFythPBCnXa0zw2B9BFtZLvS1Rns/Amy6FpXcuKGgLiF74KvlkfqQrj3Hvlwj2o2SpsWpuK7pIfElajy/OZ8l/cW 323ZOB/QigpaejQTLr3DNdj5jq51hUgFMvzgj6ZN9YbrPmQna7lBNH3H Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/ffv1dec: Use ff_rac_check_termination() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 261e0cf70c..e37deaec33 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -311,7 +311,10 @@ static int decode_slice(AVCodecContext *c, void *arg) if (fs->ac == AC_GOLOMB_RICE) { if (f->version == 3 && f->micro_version > 1 || f->version > 3) - get_rac(&fs->c, (uint8_t[]) { 129 }); + if (ff_rac_check_termination(&fs->c, 1) < 0) { + av_log(f->avctx, AV_LOG_ERROR, "bytestream termination mismatching\n"); + fs->slice_damaged = 1; + } fs->ac_byte_count = f->version > 2 || (!x && !y) ? fs->c.bytestream - fs->c.bytestream_start - 1 : 0; init_get_bits(&fs->gb, fs->c.bytestream_start + fs->ac_byte_count, @@ -350,7 +353,10 @@ static int decode_slice(AVCodecContext *c, void *arg) } if (fs->ac != AC_GOLOMB_RICE && f->version > 2) { int v; - get_rac(&fs->c, (uint8_t[]) { 129 }); + if (ff_rac_check_termination(&fs->c, 1) < 0) { + av_log(f->avctx, AV_LOG_ERROR, "bytestream termination mismatching\n"); + fs->slice_damaged = 1; + } v = fs->c.bytestream_end - fs->c.bytestream - 2 - 5*f->ec; if (v) { av_log(f->avctx, AV_LOG_ERROR, "bytestream end mismatching by %d\n", v);