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 EC50949306 for ; Mon, 8 Apr 2024 11:12:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7AC1768D16C; Mon, 8 Apr 2024 14:12:27 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B0C768D092 for ; Mon, 8 Apr 2024 14:12:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712574740; bh=G4ObjoNxPrmK0w1AYN0efOHmkKStn11dEYv9GKB3TXc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=QFTBUDRYTR/OrKBGDH7liusVygXuUNVF32t4MQBcpk2cOkDuMQeGuQPSCbL6iaScg nF1+GVnkkdy3yV4BTYDIl8hr9kxyhNX7WZ4U1xd7xnDBOG2YZ5l/O5xck6ZL04RwQ+ t/4qqhkO4vSu4agjNb+EwQ91s7BItsVozq/7tlpI= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 9856142500; Mon, 8 Apr 2024 13:12:20 +0200 (CEST) Date: Mon, 8 Apr 2024 13:12:20 +0200 Message-ID: <20240408131220.GB4462@haasn.xyz> From: Niklas Haas To: ffmpeg-devel@ffmpeg.org In-Reply-To: <20240406111445.25928-1-ffmpeg@haasn.xyz> References: <20240406111445.25928-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Content-Disposition: inline Subject: Re: [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 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 Sat, 06 Apr 2024 13:14:45 +0200 Niklas Haas wrote: > 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)) > -- > 2.44.0 > Will merge very soon if there are no comments, as this fixes a bug marked important. _______________________________________________ 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".