From patchwork Tue Aug 27 14:25:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 14728 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 42BA64484A3 for ; Tue, 27 Aug 2019 17:26:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1184868AD0F; Tue, 27 Aug 2019 17:26:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5670768AC66 for ; Tue, 27 Aug 2019 17:26:06 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id t12so21456317qtp.9 for ; Tue, 27 Aug 2019 07:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=s5zlT7uALN4/jyeLZJJMnizMxDaCi7/Jm/u3eR2wGD4=; b=QovAp1uQTX2JT74ttKsIlZIAOcuggXoJGERmBtflMykY2yGLi2xOiY4u9l0Z3ePVsH oe16evY8BJdy3D6MYHPmbIaj2uqencdlxC1jTUrIdS3rMcDvC861OFsoaolhRl3kqLWr xard2uLgCh2PAlOsBje0goP72feMZwtYO7Dq1bEqhcGB3TLbpxqPxJLNKxigCWhFSx+C 8AXhRw9wVhTVf7MJBBEGE7AwXxj6aJhzP6KVV/pTvhas1ajPA5NQ8ERKGsT2zWVMLN1y T9RiX2GxknHUC0ScxtDfYmh2cH8CG70LXQUEvZezNbu/t/rNzQGFBSM/+Kkt72KZXfRi N53Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=s5zlT7uALN4/jyeLZJJMnizMxDaCi7/Jm/u3eR2wGD4=; b=hZuBlXeor1ZOfrxoldCIC7ewLm90TqJdIys5NSG4UphkzN/yIokSNxiNYRmGfLsf4r dyGQlq63p4tD0e173YzDVx4pFt3lEIuhgjmJRv8mWSBpKGoIZCjMLkduJl3e0oLUSmFj 7bgUvDWVJAnnqA+RbVNZdZMi48ur4HVOfVLcUCb3HY0V8G/q84++VdW2fuo12aUET3TA XJbXEfVOkeF0GsueTctrWusFzrf5xEp1ORPqyY6WhMiHp1/MzzxrQrQ2Z9Q8g5pScp8l wULEmuBpr7v+1Sn+HONY4umBmdtrZdm0p4bdHmT4kjdM3ITFEJukdsGlo3vUWNswyzx+ kUrw== X-Gm-Message-State: APjAAAVgVwQElw6vp93oZBT1wDrMbdF5HmHdUvCb3Oyx9TATeCJDkKiW OL2nRiWd40K/HtyZYi6dWOdYxNfY X-Google-Smtp-Source: APXvYqzuY6Bn1UslpDhauZFlxq5wQuNQlJZyRQVEZBOfkPRnDyuXqNHUkbI3CwFAdxJLz1Sp45MNog== X-Received: by 2002:ac8:c4c:: with SMTP id l12mr994976qti.162.1566915965091; Tue, 27 Aug 2019 07:26:05 -0700 (PDT) Received: from localhost.localdomain ([181.23.84.150]) by smtp.gmail.com with ESMTPSA id v192sm8341778qka.74.2019.08.27.07.26.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2019 07:26:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Aug 2019 11:25:52 -0300 Message-Id: <20190827142552.430-1-jamrial@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/nuv: call ff_reget_buffer() only when the picture data is going to change 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: James Almer --- This is an alternative approach to "avcodec/nuv: Avoid duplicating frames", similar to the one from "avcodec/qtrle: call ff_reget_buffer() only when the picture data is going to change", to workaround fuzzer reported timeouts but without changing the behavior of the decoder. libavcodec/nuv.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 75b14bce5b..4b171fde36 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -268,7 +268,15 @@ retry: init_frame = 1; } - if ((result = ff_reget_buffer(avctx, c->pic)) < 0) + if (comptype == NUV_COPY_LAST) { + if (!c->pic->data[0]) + return AVERROR_INVALIDDATA; + // ff_reget_buffer() isn't needed when frames don't change, so just update + // frame props. + ret = ff_decode_frame_props(avctx, c->pic); + if (ret < 0) + return ret; + } else if ((result = ff_reget_buffer(avctx, c->pic)) < 0) return result; if (init_frame) { memset(c->pic->data[0], 0, avctx->height * c->pic->linesize[0]);