From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id CB8204AECB for ; Mon, 22 Sep 2025 15:18:22 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'YG2ECK1uxD3v8lpOT/dij5vcDXNBngDHBpSE1TleIuY=', expected b'HAUERSVhd5WsM+dC8+2LYpvX6sVvGP3nSas/JQXkdA0=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1758554294; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=YG2ECK1uxD3v8lpOT/dij5vcDXNBngDHBpSE1TleIuY=; b=qbgZdk/WgnL/pqLUYg/PFNHEfVqhADZRSfjOY+7riJKnUhknpgFJ+VmDmHGhOvkdRqni7 PJjkVw9zoctYYdcJUvRtmuHfizkFEGGHh4iDd+43qFR8D5+81U2kb3PludiYwP/4ZKG45EB 2wWaeBMQO6pAY5rziSFDDTHAnUs7Dq+Tzv0zdp5bEbT/Do+dtOEEeakC8t1DYhbAj2FUPYB OB+1xOK0wKeYh0VWjyIyOgvGaxp6IQfiWtYV91Vkpop+MWTBgBoKljCgTRiOeiFYjZ7JFuq vouBpOrI98SjFfVQ0n+BrqDZg4FSiwls/GNtEDomAFqd2+y4H1P49pUOs8+w== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2FF3B68EB12; Mon, 22 Sep 2025 18:18:14 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1758554293; b=a9Oh8/3ci8T7ThoOmDX4Jlx2GRIrgMailvGe/VG7/lMhJQJECI1NuViT3OBJi/XprQdrb u82ctZJEnRvSkdT8btBxWL5YZ7b6+/vkhkb6beHxSfCwGICO/V8AjIlBwC70hp8eB4FuZN+ PQ0BwoiOrJCLzn5CC5dm/589aWdYeFYG5CfEOTHH9kqJ8Ogmr3yxcNnIjbmVE8xZSDivn0i txy4UNlzKCxuHmdbksnc6jMD6AVI+lyZ4leUAfMuMe+7pcVZUS+1W/1M4+9EJrPRjZjOMzq 8zYHLBOusATPOWDpdjRscw4hrxAgDiMuZGfCW9YCFwWY752Nf2EyuvRttDtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1758554293; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=puSnxOOhIbtQcY0d3hNxIryYkpYe2oTRmI+esfbEQ1c=; b=tgHHxQ6ZdWVGTFDmQkqGfB+BEyAa+Z/KfXBy82f2bouKr2aSqlDTQ9z4HqY5k77rbZBAa pcq52bMYKZWtlmJ/A2ZhK7z36FAr4wn/CBrdpJ6OBHdY/DWgsO55M8g6qv33SUxPMesjyIl +OsCayZT5X5z9u4/IOC6ATKHDLh/SkTKq9Xjm42bTZhlo4I8rvXwgYZjCSKk+i+z35axZqO k/7bFeErkGrLVF0KYXx+CIbTtwrBof8auIysN7an1OcwBKRK4+qx1Is2PFhB7+au/33OyE0 GZzQ7BpkQfkHQTYYOqwcgjUlnzztk9vQ2gnqlL2I3Lyk51bKD7SDkP21Xwow== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1758554285; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=HAUERSVhd5WsM+dC8+2LYpvX6sVvGP3nSas/JQXkdA0=; b=o1F5B2l+tbwSSepGoykntJDpMYz0sRxxP7D2IDUDzJbwGesvrQzK7FA//3/3p+X/8l9Zp 8Bk7FRCB8mfCnKPVCuSt4j+I8RuN7mR3EmCy7pdBRktxHXOXR1dEHQ4oDaGYMie5B3X3iR/ qXGjKoGbUdHW4JbCBdLUHwvsIOcxY6us/QA5uyfB4A8JNq8fTQWyRMoVtwfY5W1SUNMHWQI AQeuTVKTLqONGXSrgyC/5LDhmDC3Fl5J8m6bIDT+4j8mx5jXPcIovdgw3kKjzWUElHQ8g58 AmxCBEzPQYCUdcLO5OT/Z6HkEDiF4wWZfRxSvyy1fual77Ox9JNOO2RCuz3Q== Received: from ed19c606a818 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 041D368EAC0 for ; Mon, 22 Sep 2025 18:18:04 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Sep 2025 15:18:04 -0000 Message-ID: <175855428512.25.10341784145624175499@463a07221176> Message-ID-Hash: FHCYEIGG27WTTSEE2QOYNNMFAP7OCTJ7 X-Message-ID-Hash: FHCYEIGG27WTTSEE2QOYNNMFAP7OCTJ7 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/aom_film_grain: fix AVCOL_*_NB range check (PR #20577) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Niklas Haas via ffmpeg-devel Cc: Niklas Haas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20577 opened by Niklas Haas (haasn) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20577 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20577.patch These should also exclude the _NB values themselves. >>From 025b89018fc8a9d9e457a0c102101fd9bf01fa3e Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Mon, 22 Sep 2025 17:14:45 +0200 Subject: [PATCH] avcodec/aom_film_grain: fix AVCOL_*_NB range check These should also exclude the _NB values themselves. --- libavcodec/aom_film_grain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/aom_film_grain.c b/libavcodec/aom_film_grain.c index 0f24a2bcf8..bd9647afe9 100644 --- a/libavcodec/aom_film_grain.c +++ b/libavcodec/aom_film_grain.c @@ -199,13 +199,13 @@ int ff_aom_parse_film_grain_sets(AVFilmGrainAFGS1Params *s, fgp->color_trc = get_bits(gb, 8); fgp->color_space = get_bits(gb, 8); fgp->color_range = get_bits1(gb) ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; - if (fgp->color_primaries > AVCOL_PRI_NB || + if (fgp->color_primaries >= AVCOL_PRI_NB || fgp->color_primaries == AVCOL_PRI_RESERVED || fgp->color_primaries == AVCOL_PRI_RESERVED0 || - fgp->color_trc > AVCOL_TRC_NB || + fgp->color_trc >= AVCOL_TRC_NB || fgp->color_trc == AVCOL_TRC_RESERVED || fgp->color_trc == AVCOL_TRC_RESERVED0 || - fgp->color_space > AVCOL_SPC_NB || + fgp->color_space >= AVCOL_SPC_NB || fgp->color_space == AVCOL_SPC_RESERVED) goto error; } -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org