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 403F748E7A for ; Tue, 30 Apr 2024 00:49:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E099368D58F; Tue, 30 Apr 2024 03:49:05 +0300 (EEST) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC37068D57A for ; Tue, 30 Apr 2024 03:48:57 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 20D9120002 for ; Tue, 30 Apr 2024 00:48:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714438137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QnIWNtOxRKdymDOIQYttGX8PsysGj3fzqnlDxyMqbNE=; b=FV0m6LkBveZMaPLZ+vmg9ta2o0EeisoCglrV0+VP9rtWBwsazmJVHQPy/vKQiSFC7cCKFV bmwY5WGv4du6tW42Keo3jQy7fWAfhmRcPjwHWfPElvItymMxxQrmS/LuG27d8cGuqgC+LC rtGWaZIIlOgtquwcOXVuXkJ+8Y4OgQqEvo8MamQuTf/7Ph4OJJM/19S/hg3CTAJ4PRrp5H tZqYIvbOp/j0Rd8BKsnNkzaz5EdnsDJgl8BAzZJF+6Dn1gbIgKDn5R1CXbqcVI1WhOejD9 Jq3gVlUve3W8LhHQRCN/vFatckUq+dUyDvrxZewmbpnken8D50ZwAR/f8XYGFA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 30 Apr 2024 02:48:54 +0200 Message-ID: <20240430004854.199741-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240430004854.199741-1-michael@niedermayer.cc> References: <20240430004854.199741-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/3] avutil/opt: Preserve nb_channels in opt_free 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: Fixes: division by 0 Fixes: decoder modifying demuxer channels on failure Fixes: -sseof -5 -i zgclab/ffmpeg_crash/poc3 Found-by: Wang Dawei and Zhou Geng, from Zhongguancun Laboratory Signed-off-by: Michael Niedermayer --- libavutil/opt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index ecbf7efe5fb..24c08e4bc06 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -132,9 +132,11 @@ static void opt_free_elem(const AVOption *o, void *ptr) av_dict_free((AVDictionary **)ptr); break; - case AV_OPT_TYPE_CHLAYOUT: + case AV_OPT_TYPE_CHLAYOUT: { + int nb_channels = ((AVChannelLayout *)ptr)->nb_channels; av_channel_layout_uninit((AVChannelLayout *)ptr); - break; + ((AVChannelLayout *)ptr)->nb_channels = nb_channels; + break;} default: break; -- 2.43.2 _______________________________________________ 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".