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 ESMTPS id 20D9F4BE2E for ; Mon, 3 Feb 2025 22:37:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1AD0968B528; Tue, 4 Feb 2025 00:36:52 +0200 (EET) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E73E968B480 for ; Tue, 4 Feb 2025 00:36:44 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2164b1f05caso82992145ad.3 for ; Mon, 03 Feb 2025 14:36:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738622202; x=1739227002; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=CalSkFlXBvSPwY3KistWdKfG5ICK1K500+fwlay661s=; b=DruP7CSAqu7NlmoSqQUBTHaO8/tujfPJYtu2pE2cAVfoORah7weSzMqKBVu/BgICXp Ib6BgIsLvX9xpPINVRtOHl7ds/OzKIcoKyFoHT+ADk4tHqY1RB+besAXxYiW0exMPNuL dO3YwN9Q8IajyPnZHaPizj1N91jMUWewci/AqvWmTB+g7G1xmEeGJIbMpKvd3nlPEkeA oAHuXMOVOqKTznGQBUsAcaFPjS8UlOiCni5lyfjxCSV8OPmnft3h0uvmmvBTv74Wbjs+ ldi191qJKvJVxOHEoCLGr3tM4DEF8bilv1UfTQYcvVF93jyOoDg2QJR9HBv65hhgu0S8 tNtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738622202; x=1739227002; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CalSkFlXBvSPwY3KistWdKfG5ICK1K500+fwlay661s=; b=v96SW1PyRce4HUotGUywVcFZ1rGvBc55ucAxWgejaic/+1bNedznqXFlKc2yhn86wC T8WeDiyyCMQfw4Z0/TkBJ8G93e1OUopIkdZgIgZ1qbOcxPeSg2mP5joD5WI2SaxC+dEl zx2Zx7nMtuG7dI7zRAIO0C+Q1a6+MsVSyLouGSKSOf3A8tMVICgnS1YnMPYlbzRIAVv4 lVFVSl7RTI8PuI/z5JGPO6u5QwaogCSjNR+PmeXmPpLmMHz1vCXA3T6YSQDu8EQKaPke FpTnmA5msUrqyFnYdZ/WdN9bROpj7XH1aZlRS8sgH40jBDebaTayU0bBH40LwfkhquG6 Sicw== X-Gm-Message-State: AOJu0Ywltq4KVUo4aqMEaSMCY/SWT6zRxZIc/pwpIsRuM3yx+Ze39rvU NUM4rMHz6CsGnJ2AUZ+Gt2BE5YOHTnSg/I2u9J2vadhzdnl410g21QxruY2q X-Gm-Gg: ASbGnctlePhlHPCT63iGr36xeJHpBAH4UAZLyX+Rzs5/B086+CFjEp5XUOmSMVbCMLE WCwQ3yNX5yOJW/6Svf7I9IZhqjxFX6TzRkNksQPCBLeIXAXRZx+406FBwthK0BBp7e3QFy9c6sr gI+gPJvk/UoPZbCqAPI6Dsf2+il1Chqc41C1gezvKcrFqnPNvWhbvGyJNC2U8yHVSGSI/INuGdT Cj0UVfDyzn4cqWtMRLKy3ZB4GEiLy9WyTneHgLe56Tr4etOvJS9LJ/g+CvH5RHLS+GXxihSTdha VUQC6YOPMx9VFDFXXSeWTqtPesljz4w= X-Google-Smtp-Source: AGHT+IF+iXQk+PtS340AaQGiCGonDRHw1OtbIH2XeRgCQqWiN0vQu5UGNPmopwBADmfgwUuGMn6Vkw== X-Received: by 2002:a05:6a20:7f84:b0:1ed:5247:f385 with SMTP id adf61e73a8af0-1ed7a6e0689mr36617016637.38.1738622200582; Mon, 03 Feb 2025 14:36:40 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:7d9c:3d76:2afc:cc38]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ad11841ec59sm5154543a12.57.2025.02.03.14.36.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 14:36:40 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Feb 2025 19:35:44 -0300 Message-ID: <20250203223546.12224-4-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250203223546.12224-1-jamrial@gmail.com> References: <20250203223546.12224-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/hevc/sei: ensure num_ref_displays is not set unless the SEI message is valid 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 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: This field can be used the same way "present" is used for other message types. Signed-off-by: James Almer --- libavcodec/hevc/sei.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc/sei.c b/libavcodec/hevc/sei.c index e11a33773c..8793d86fdc 100644 --- a/libavcodec/hevc/sei.c +++ b/libavcodec/hevc/sei.c @@ -152,6 +152,8 @@ static int decode_nal_sei_timecode(HEVCSEITimeCode *s, GetBitContext *gb) static int decode_nal_sei_3d_reference_displays_info(HEVCSEITDRDI *s, GetBitContext *gb) { + unsigned int num_ref_displays; + s->prec_ref_display_width = get_ue_golomb(gb); if (s->prec_ref_display_width > 31) return AVERROR_INVALIDDATA; @@ -161,12 +163,12 @@ static int decode_nal_sei_3d_reference_displays_info(HEVCSEITDRDI *s, GetBitCont if (s->prec_ref_viewing_dist > 31) return AVERROR_INVALIDDATA; } - s->num_ref_displays = get_ue_golomb(gb); - if (s->num_ref_displays > 31) + num_ref_displays = get_ue_golomb(gb); + if (num_ref_displays > 31) return AVERROR_INVALIDDATA; - s->num_ref_displays += 1; + num_ref_displays += 1; - for (int i = 0; i < s->num_ref_displays; i++) { + for (int i = 0; i < num_ref_displays; i++) { int length; s->left_view_id[i] = get_ue_golomb(gb); s->right_view_id[i] = get_ue_golomb(gb); @@ -199,6 +201,7 @@ static int decode_nal_sei_3d_reference_displays_info(HEVCSEITDRDI *s, GetBitCont } } s->three_dimensional_reference_displays_extension_flag = get_bits1(gb); + s->num_ref_displays = num_ref_displays; return 0; } -- 2.48.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".