From patchwork Sun Jun 27 13:53:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28726 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1123358ios; Sun, 27 Jun 2021 07:00:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZMgRcx3wVux9kXq2XaoWt0UXUNV8BO9fmuZWcCGHrUD2iEKfZmI9hLJAKPW1mohG7CnEY X-Received: by 2002:a17:906:590a:: with SMTP id h10mr19880273ejq.346.1624802403905; Sun, 27 Jun 2021 07:00:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624802403; cv=none; d=google.com; s=arc-20160816; b=vXyTaN2PouSSRIsyi9FXxpH0uTlVzcrFRTYPOqgAkDZUjb8vcqVzVMUjRNE2ws4eJX F6NWoSbR6KmcVh/H12T/HZsLJ68b1okqVDheAJkgEaJvfPG7FhGz9yT/sVpDrX/CjS9n AhvCe1KX8As5XbLUSn9hdlQ20yg1o0sNmqeOgNk+mA7geWV2mFsMjJ8LrjOIgjce538q yP8UYo55f7H7JeW0ZBGoyJlKaaGBePUZBF5aiAIQnsdncwkxKxEVySMZmO3XfIUDp8mo PjriVydknRNGhoqIiuwDrih4oZg8W/79UhnqKquCddpU2/2CrlrMPm1sZ1nUicZxi9/I HXZg== 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; bh=M3Ai934T9ciUf7xPhy7GLZ4WhvHDwyCfj48yC2zTWVA=; b=FAG/vpV4qCCCX6IPHtkkFZRnWBnb/ke7YMfh58ZGye19YwPGgmz9pJ/vLOBa9FwMUR YQke0IkexKKP0iDgVAI+ohZ+FyqpUp97ZQF8GSUpxInhLD/qlI3g2A+cw+bfxxKL7a4z CvHnM1V6D0y5Wo2bAXim3+DoMHkXR7lFA/M4Xxt8VzllmgTK+kLwOBp02tzrJNpz6zI+ lbkEI4WfEzdDbtf3V3boKuQlClzVjC+mAe+3pzSjuCg+5qu+BS4nZQIhs6tPm+AngxDf +2vmck6stLv8UDF9eCym82wWbBemWtCXKSi/0aenw2qW5Lp16yRWmhtmvJHtMVZk63Fd euTg== 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 s7si727158edd.314.2021.06.27.07.00.02; Sun, 27 Jun 2021 07:00:03 -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 C2B8E68A16C; Sun, 27 Jun 2021 16:59:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E51CE680A4F for ; Sun, 27 Jun 2021 16:59:51 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lxVEd-002a5l-07 for ffmpeg-devel@ffmpeg.org; Sun, 27 Jun 2021 15:54:07 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id xVDflEDypljeHxVDflq4tG; Sun, 27 Jun 2021 15:53:07 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=faTjlpxDn0tOM1i9kjkA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 27 Jun 2021 15:53:07 +0200 Message-Id: <20210627135307.14008-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfG7oGFc7ujeBjYCtaWplK5zaQ962UUa/ZAq78IUpQyJ/jtowjQC6/GcyQvkXNwwVn8uD3dsMjFokrAp3uww0LVv9NBiLXmRtaxe6Q90IihJxcAPv/Zbq a3aH2TOQPYu49muv9Q9yVstKhp4CHtaX+jVeonvH+PzY6dgVvtWcPr3G Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: Adjustable discard threshold X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 6/w9QiS6yxS1 Fixes regression Fixes: last frame of Ticket9287 Analysed-by: Andriy Gelman Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 02a987fd0c..fbc94c46d7 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -338,7 +338,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height); if (av_image_check_size(width, height, 0, s->avctx) < 0) return AVERROR_INVALIDDATA; - if (s->buf_size && (width + 7) / 8 * ((height + 7) / 8) > s->buf_size * 4LL) + if (s->buf_size && (width + 7) / 8 * ((height + 7) / 8) * (100LL - s->avctx->discard_damaged_percentage) > s->buf_size * 4LL * 100) return AVERROR_INVALIDDATA; nb_components = get_bits(&s->gb, 8);