From patchwork Wed Jul 26 01:26:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4456 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp211525vsb; Tue, 25 Jul 2017 18:27:18 -0700 (PDT) X-Received: by 10.223.167.9 with SMTP id c9mr20261054wrd.163.1501032438452; Tue, 25 Jul 2017 18:27:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501032438; cv=none; d=google.com; s=arc-20160816; b=YMsCYS6ezCPA3o8+nT64qlU7KnExfCNRHYLju79ABGM+x8SUrjDChpBIeXoJSkHFFK Wuwjvy60b2zQdbbjWtce5gVfWPo7xHx6Jw4/uB46mcrWBxIz5JF4xKxy4xgPVn1lW9si IzV7mEs6vBsQLhBfoilPhx0KrgyJ9OVsb4rswYGnVHy7/XlxW42GFIxHRXs6n22NNCC8 Jke/kR1TOEoDmgD+FI5Jr/SbohGywaBohVHMkAmJXrpZxkaaYGu8ET7d4S3HvIEPa8tN 44q1p76aT5/DjzRVRmmYpxTqVBClX3Cof+eyIxP8Q1tqdHlhAmF8j97k3V0DYKBjEWJB hNvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=lzyHdkNBx7Qv4hx2qlcLYdP65U3D1oemv/E24v8uIac=; b=dKaYKgWX1HkI3UFvi/WxNf8VH1fgj2d8fSWE83X+I07G0m0G+HhQhvDDq4yTWS0Eml Nm2bPt1EDNtSC7hCV6yTGyWIEy7TE4rPB7o+cGSya7oo/0kV9iEaH4P8w1vQaZfzpUkw 8T4eDYB1szOexK49fhwriwEKscgjrYZLILEj0piPBsul2fquUYJDWkjEioExyKUsNn9B hMDR8idZ4omhyD/PMFQKc31kISTSTZta58oQS5ri/89zSfiEjEehrVKtnqGAYLkzwjtX L7koIi0Qauzm0LtYpBFu5CQTWUydIZbUvhyTWttX26CEciQc+j9Vi/VjyYlJ6NyyFtRw 1A+w== 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 31si14700716wrp.256.2017.07.25.18.27.13; Tue, 25 Jul 2017 18:27:18 -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 C64E568826B; Wed, 26 Jul 2017 04:27:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe07-1.mx.upcmail.net [84.116.36.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94E98680AAC for ; Wed, 26 Jul 2017 04:27:03 +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 1daB6N-000612-BZ for ffmpeg-devel@ffmpeg.org; Wed, 26 Jul 2017 03:27:03 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id pDT01v00B0S5wYM01DT19T; Wed, 26 Jul 2017 03:27:01 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 26 Jul 2017 03:26:59 +0200 Message-Id: <20170726012659.3680-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH] avcodec/dnxhddec: Move mb height check out of non hr branch 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: out of array access Fixes: poc.dnxhd Found-by: Bingchang, Liu@VARAS of IIE Signed-off-by: Michael Niedermayer --- libavcodec/dnxhddec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 40d41f9bf1..f46e41a456 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -298,14 +298,18 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, if (ctx->mb_height > 68 && ff_dnxhd_check_header_prefix_hr(header_prefix)) { ctx->data_offset = 0x170 + (ctx->mb_height << 2); } else { - if (ctx->mb_height > 68 || - (ctx->mb_height << frame->interlaced_frame) > (ctx->height + 15) >> 4) { + if (ctx->mb_height > 68) { av_log(ctx->avctx, AV_LOG_ERROR, "mb height too big: %d\n", ctx->mb_height); return AVERROR_INVALIDDATA; } ctx->data_offset = 0x280; } + if ((ctx->mb_height << frame->interlaced_frame) > (ctx->height + 15) >> 4) { + av_log(ctx->avctx, AV_LOG_ERROR, + "mb height too big: %d\n", ctx->mb_height); + return AVERROR_INVALIDDATA; + } if (buf_size < ctx->data_offset) { av_log(ctx->avctx, AV_LOG_ERROR,