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 AF05F4B7F2 for ; Fri, 14 Jun 2024 12:00:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 584FA68D67F; Fri, 14 Jun 2024 15:00:26 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9222A68D5AF for ; Fri, 14 Jun 2024 15:00:17 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1718366417; bh=vTSH8oaQRxgd2/gA6yvk4Jo6s/464K/4REVMWHByzh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GFmbAPX85dUBPdBiuqUxf0Z6FikzH+wRTv7OSYL/J0d5mIxZb+UuvCgV7Enebg3Qz F+k58+iUqkxIKYwITXc3Xy0nHbJa7UCJCE4uQIBRGcw6COrLnz5L6N2qBaWTMewzFp 3Fz4RoaawJgN/GEJKEN2zmNT80j2PCRiK+osloJE= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 50AD2418F4; Fri, 14 Jun 2024 14:00:17 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jun 2024 14:00:14 +0200 Message-ID: <20240614120014.31038-2-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240614120014.31038-1-ffmpeg@haasn.xyz> References: <20240614120014.31038-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/dovi_rpudec: validate L2.ms_weight 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: From: Niklas Haas This is specified to be in the range -1 to 4095, apparently the only extension level with such a restriction. --- libavcodec/dovi_rpudec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c index fc3b0a2b82..306efbb31f 100644 --- a/libavcodec/dovi_rpudec.c +++ b/libavcodec/dovi_rpudec.c @@ -143,6 +143,7 @@ static int parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm) dm->l2.trim_chroma_weight = get_bits(gb, 12); dm->l2.trim_saturation_gain = get_bits(gb, 12); dm->l2.ms_weight = get_sbits(gb, 13); + VALIDATE(dm->l2.ms_weight, -1, 4095); break; case 4: dm->l4.anchor_pq = get_bits(gb, 12); @@ -172,6 +173,9 @@ static int parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm) } return 0; + +fail: + return AVERROR_INVALIDDATA; } static AVCIExy get_cie_xy(GetBitContext *gb) -- 2.45.1 _______________________________________________ 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".