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 948314B7F8 for ; Fri, 14 Jun 2024 12:00:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4387C68D671; Fri, 14 Jun 2024 15:00:23 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A89F68D5AF 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=sHEMVMN5Qq6FpJrLRvjh3jFW5kyy6Vkohm9GAN3mBOY=; h=From:To:Cc:Subject:Date:From; b=Zu034II8TI8J1+US5Dma+vWtpYsKh9ZjFtYvYWRf+rJchdHimqbRMflKx5rYSYyB/ gdNZUWvjGxIIcfcGvHSFNMYLmLXDni1jt3pf8qsGUVpY9HlsiTZEDcYbGWfmLViNxc Fevf/0VYpjkaQ6KAcDNF3spzsG1Sv6nBHQHmfjXM= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 1A14541128; Fri, 14 Jun 2024 14:00:17 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jun 2024 14:00:13 +0200 Message-ID: <20240614120014.31038-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/dovi_rpudec: add return code to parse_ext_v* 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 --- libavcodec/dovi_rpudec.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c index a477dbd4e3..fc3b0a2b82 100644 --- a/libavcodec/dovi_rpudec.c +++ b/libavcodec/dovi_rpudec.c @@ -127,7 +127,7 @@ static inline unsigned get_variable_bits(GetBitContext *gb, int n) } \ } while (0) -static void parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm) +static int parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm) { switch (dm->level) { case 1: @@ -170,6 +170,8 @@ static void parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm) av_log(s->logctx, AV_LOG_WARNING, "Unknown Dolby Vision DM v1 level: %u\n", dm->level); } + + return 0; } static AVCIExy get_cie_xy(GetBitContext *gb) @@ -181,8 +183,8 @@ static AVCIExy get_cie_xy(GetBitContext *gb) return xy; } -static void parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm, - int ext_block_length) +static int parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm, + int ext_block_length) { switch (dm->level) { case 3: @@ -254,11 +256,13 @@ static void parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm, av_log(s->logctx, AV_LOG_WARNING, "Unknown Dolby Vision DM v2 level: %u\n", dm->level); } + + return 0; } static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver) { - int num_ext_blocks, ext_block_length, start_pos, parsed_bits; + int num_ext_blocks, ext_block_length, start_pos, parsed_bits, ret; num_ext_blocks = get_ue_golomb_31(gb); align_get_bits(gb); @@ -278,10 +282,14 @@ static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver) start_pos = get_bits_count(gb); switch (ver) { - case 1: parse_ext_v1(s, gb, dm); break; - case 2: parse_ext_v2(s, gb, dm, ext_block_length); break; + case 1: ret = parse_ext_v1(s, gb, dm); break; + case 2: ret = parse_ext_v2(s, gb, dm, ext_block_length); break; + default: return AVERROR_BUG; } + if (ret < 0) + return ret; + parsed_bits = get_bits_count(gb) - start_pos; if (parsed_bits > ext_block_length * 8) return AVERROR_INVALIDDATA; -- 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".