From patchwork Sat Apr 6 11:14:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47878 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1472911pzd; Sat, 6 Apr 2024 04:14:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUaUQbW8mMw0eFLGuRlUo5u6f3Kkd2LqbZMqdOO0GqOJih0O4aTGL9ABjhMgAiDkVLt+SoLsdow35Po4MOeeByhCC1Wlh1tjBNjbA== X-Google-Smtp-Source: AGHT+IG8qY4Vimhajm/c9saZIrAuF8vfNIeuFWlmIqAB17XDRRNHIXQeuwNxz5r+FpLotMxowz07 X-Received: by 2002:a05:6402:3881:b0:56d:c77b:4f0c with SMTP id fd1-20020a056402388100b0056dc77b4f0cmr4122973edb.2.1712402097628; Sat, 06 Apr 2024 04:14:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712402097; cv=none; d=google.com; s=arc-20160816; b=Lzp4mfP1XhMKwmN3aRCnb3XjeQMPE2wJNJdkdykKVuX9zq9YRih9kAoa6KiwgOrtsP vIwh+28BAbG7k7P0uBhdGr2ig4X0PR0tJVQbQXuf6Rt+KhWDF7LL8/fxlPiAHfriwd4U q0pHGoO9ZQGzkj24U7PKLs9dP9/zPX2tiVR95l3Uodkq3wA19jbFJuaWOIbSGJvqVtbp lYIVPFEymxWxeymRDwBMZSTTjDqiAdSGAkze0SlvKT6+aO9c9/RU3utfnApFhmjm+54Z z0QtFAR1iySrJbdixdzJNlZX/XJbKOW8mjKJl4jQbfufHz12+x2soVYQY88HIUN7m/fC cTNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=f5Es/LZevcyoBMg6gW8H7jFaYG3SLEEBz/ERDHYKM48=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=jylfao2m02QTCz7ySeqVvK4kzbySVl6Yg+M10+OILhpHsu7QrMVcdZi2H+jks1VM+2 cOaEcdWX8/ljV+H8+2UZldIfdlIO73SSBDUruJDH1Vrv61Ifmm2PcnjpEyNZseZJEla1 Yssypp0DspV70IOHc23Ceb4OmbuD2nSIvluQOmSLuqYemrFxLwA2gZ/tLgLqLG3UIKtP gKV1enyx8aTOm9BIt2UaUMMP0pSS3lp2rg33R12Mot6rSB4x4Ixsaxh+k0R/2CAlEojz p2p1whivtKxqfdNJoTlC3oPJGkTTOQiMicr0p+5BGwkM64+X5kwcqV+2fpKczTJb7Mwc kVtQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=DTYEFufg; 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 v5-20020a509545000000b0056e12cf74dasi1647711eda.254.2024.04.06.04.14.57; Sat, 06 Apr 2024 04:14:57 -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; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=DTYEFufg; 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 3F18968C157; Sat, 6 Apr 2024 14:14:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 015D168CE20 for ; Sat, 6 Apr 2024 14:14:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712402087; bh=7ZWfvfE5Hgm+l2QN57BSrV/4YhHw32eR9TxxT3y+Iw4=; h=From:To:Cc:Subject:Date:From; b=DTYEFufg8Hvb2vrNeZUH64b8I+8cGPj/sSfTz4/xxBQ3RRc2BcttSM1TG+Jjwa8Jd VKILArWaP4ztZ/ODta6ozoP9JjdXJK9a+lUmo2ANIQzSvX4a04b7SecbpGW12/hkML K1WRfWjeFB5JUIuinluNSK/yJLNhW3ojzrFov79Q= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 03C3F410B5; Sat, 6 Apr 2024 13:14:46 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Apr 2024 13:14:45 +0200 Message-ID: <20240406111445.25928-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/hevcdec: fix segfault on invalid film grain metadata 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qt17cHCLoc+T From: Niklas Haas Invalid input files may contain film grain metadata which survives ff_h274_film_grain_params_supported() but does not pass av_film_grain_params_select(), leading to a SIGSEGV on hevc_frame_end(). Fix this by duplicating the av_film_grain_params_select() check at frame init time. An alternative solution here would be to defer the incompatibility check to hevc_frame_end(), but this has the downside of allocating a film grain buffer even when we already know we can't apply film grain. Fixes: https://trac.ffmpeg.org/ticket/10951 --- libavcodec/hevcdec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 727b02f0f40..d3b668af00e 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2893,10 +2893,15 @@ static int hevc_frame_start(HEVCContext *s) !(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && !s->avctx->hwaccel; + ret = set_side_data(s); + if (ret < 0) + goto fail; + if (s->ref->needs_fg && - s->sei.common.film_grain_characteristics.present && - !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id, - s->ref->frame->format)) { + ( s->sei.common.film_grain_characteristics.present && + !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id, + s->ref->frame->format)) + || !av_film_grain_params_select(s->ref->frame)) { av_log_once(s->avctx, AV_LOG_WARNING, AV_LOG_DEBUG, &s->film_grain_warning_shown, "Unsupported film grain parameters. Ignoring film grain.\n"); s->ref->needs_fg = 0; @@ -2910,10 +2915,6 @@ static int hevc_frame_start(HEVCContext *s) goto fail; } - ret = set_side_data(s); - if (ret < 0) - goto fail; - s->frame->pict_type = 3 - s->sh.slice_type; if (!IS_IRAP(s))