From patchwork Thu Jun 28 22:57:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9552 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp148686jad; Thu, 28 Jun 2018 15:58:48 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfG7PvhrGvQXi4jIN1qGZFkpZzu05H4OhpGOvzn1IiVaraJHpUilRJfZYMfb7e9XW/Fkkim X-Received: by 2002:adf:bd89:: with SMTP id l9-v6mr10398146wrh.266.1530226728795; Thu, 28 Jun 2018 15:58:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530226728; cv=none; d=google.com; s=arc-20160816; b=n420yaPN6krRv+Kb3bFc1MQg5P2+zp7/05rH+1Ou5+swmLye/dvKpWlMoUAQMjX+tT FRnfB3IaBFAbx2Kjr6PLpJQqfUPi/oqn6DgLxFkC0WSvXnp+YZoBlNJzA1Rfkk+hJ0G0 iiifviU7ixKrH571aJVHFBsTVQHRf+nO1S906negD6gbJtE5Kc4SiGMd20cLpKIf5k36 hhvu9SVA9olt2+9Dho84J+EuftQzDkyak+IniHGHUYd0ftKlnJV1iq3CfFL1wsO1phXj MeiJmnZqb1agY2Fbxuh4YUMhCrc8fqrvqPr6QKbfJSEF3eoPj/kGV4/L03LBOA/nbOAN K+Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to:arc-authentication-results; bh=T9emRwx8za7KnCZpXGGmyDY0gQ2JDHRL2WHdK7bkb3I=; b=h+IXRy0erdDmPXRHvTy0XQP1jDEvuarghv8dfqfJBH4+kZtpH85p38irzuk2s77+xi JrPdeBFtibLkLvu9gANHfbvRGCE9kHBL2EXvPRAcGEeO8Lk+3DXlGGkwqSsKd5npX9WO E0Wb7ZfcF8meFSPQ5E0x3bryH79rs3iq1u9/KmNxtiZQY6WpDA+VgTX3mg/0tDbOGUXZ OXP/w47n9ZifA1myHwdPc8206+qpew0a1tFg/G6o4gJ8J24XMxbwExon0J4QV8zql2y2 wHTej13EjAF7a81ulTOO27YUN7lPJzkfwpWpEnNOwjgLwOfTdWLFNhBKAVWJk/86B/Y4 inbQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r9-v6si3588947wrr.366.2018.06.28.15.58.47; Thu, 28 Jun 2018 15:58:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8BB5468A600; Fri, 29 Jun 2018 01:58:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-2.mx.upcmail.net (vie01a-dmta-pe07-2.mx.upcmail.net [84.116.36.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0851A68A1AD for ; Fri, 29 Jun 2018 01:58:38 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fYfs7-0006L7-4f for ffmpeg-devel@ffmpeg.org; Fri, 29 Jun 2018 00:58:39 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 4NyV1y01R0S5wYM01NyWse; Fri, 29 Jun 2018 00:58:31 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 29 Jun 2018 00:57:45 +0200 Message-Id: <20180628225745.14411-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/vc1_block: Fix mqaunt check for negative values 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" Fixes: out of array access Fixes: ffmpeg_bof_4.avi Fixes: ffmpeg_bof_5.avi Fixes: ffmpeg_bof_6.avi Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart Signed-off-by: Michael Niedermayer --- libavcodec/vc1_block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 5427de4ec6..74d5e27803 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -204,7 +204,7 @@ static void vc1_put_blocks_clamped(VC1Context *v, int put_signed) if ((edges&8) && \ s->mb_y == ((s->mb_height >> v->field_mode) - 1)) \ mquant = -v->altpq; \ - if (!mquant || mquant > 31) { \ + if (!mquant || mquant > 31 || mquant < -31) { \ av_log(v->s.avctx, AV_LOG_ERROR, \ "Overriding invalid mquant %d\n", mquant); \ mquant = 1; \