From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BA209447B2 for ; Fri, 25 Nov 2022 14:25:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 57A1268BC44; Fri, 25 Nov 2022 16:25:38 +0200 (EET) Received: from mail-ua1-f48.google.com (mail-ua1-f48.google.com [209.85.222.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECC4B6883DD for ; Fri, 25 Nov 2022 16:25:31 +0200 (EET) Received: by mail-ua1-f48.google.com with SMTP id e24so1594114uam.10 for ; Fri, 25 Nov 2022 06:25:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=YSnR3LxMNUoFkyKmyIZCBOE7yJfCOHOnldtfLp9U5gw=; b=nK4c788zCDMGywhPdxMi1Mo3/T11Va2WmLCjRuQaHwmGZ3bRx2LnB1iLdZ9U2TfkPW mY1bRQPA3SEYu8Wr7RYCb59atxur1/7m1Oknt1tfWfMmE0TKtisSFDSj82PqwcwoIOhc u2q97T3DyiY0QELooiGbsUnMkfr2zfOiljDOX03dC/k2RWAfBussYzNwqjABufQgNFKp hDwDwGzJjJLZGRn16PuawnNO7uw/BWmURR/tZDgvLi0abi/mHJ2x6qlXcJNSR2oS0OJt 0wrNptN2Y3a8Oq+KC+2RlBxa6Ahd1f3x9Rk6X+Vsgf1tLC84TsZrF+lAPaS+DPv9q1Ho PBcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YSnR3LxMNUoFkyKmyIZCBOE7yJfCOHOnldtfLp9U5gw=; b=7tCsjgimLlNU/bj/djnPcrrYfmndM5UkOVgmTB1Mfa2tAZcMsvfJBqFxU4Wq2QxwSL 62ic9m+am1+2QE8j06YxuRecZ+Jn7k3pODTkfZH1Xxqe9OlyzO+7DTax87qCMaeCa2Eb R4PJuo/OJxpRsTHQWF4/e3vR8FjInLuVZwd2ob/YS1A9Go+tEiWzG7G9P60Hgf6WKGi3 MISvuKL2psaoCsP+pzEX8oBkFpDuU0qCoe1mHD0gAa/Gj73JGBuYo5M4ytIMKIAOwBVe zVaEkZS8zLp0BB9Cls+Up5HYhOOi+1EYgqGK6A5ZmbpiBWA84BT93CxcV4pHimJpZfQ5 tg1A== X-Gm-Message-State: ANoB5pk3NeQSSFqGBJutOmdD7xLBrZtuvVgVJh5P/gTu8aVXpXclr7v8 1V4sxxb6+5+k3JCjooEj/v1lVkLPBJCbg1/PLs+Lnslw X-Google-Smtp-Source: AA0mqf4/Bd3LmLgVMfn2uvQG4cSUm82IIXx6HM/odC9gdS+anCxrCMBCuTmklLJdYPTl1MdXCs6UiwzR06nGj5KqJ1E= X-Received: by 2002:ab0:268e:0:b0:3e3:81cc:b64e with SMTP id t14-20020ab0268e000000b003e381ccb64emr20469847uao.57.1669386330489; Fri, 25 Nov 2022 06:25:30 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a05:612c:2428:b0:32a:5eaa:92e4 with HTTP; Fri, 25 Nov 2022 06:25:29 -0800 (PST) In-Reply-To: References: From: Paul B Mahol Date: Fri, 25 Nov 2022 15:25:29 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] avcodec/pngdec: Mark damaged frames as finished 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 Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 11/25/22, Andreas Rheinhardt wrote: > Fixes the deadlock reported in ticket #10071. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/pngdec.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c > index 8080094d65..f1cad26c52 100644 > --- a/libavcodec/pngdec.c > +++ b/libavcodec/pngdec.c > @@ -1362,8 +1362,10 @@ exit_loop: > return 0; > } > > - if (percent_missing(s) > avctx->discard_damaged_percentage) > - return AVERROR_INVALIDDATA; > + if (percent_missing(s) > avctx->discard_damaged_percentage) { > + ret = AVERROR_INVALIDDATA; > + goto fail; > + } > > if (s->bits_per_pixel <= 4) > handle_small_bpp(s, p); > -- > 2.34.1 > ok > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".