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 9F4EE4E3EA for ; Tue, 11 Mar 2025 02:50:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD6E868DEC3; Tue, 11 Mar 2025 04:50:03 +0200 (EET) Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7847D68C2E2 for ; Tue, 11 Mar 2025 04:49:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1741661383; bh=fCkdZK+W9fwMaDciUXvdyIzOWdDsWvx3DczlXjaZ5bI=; h=From:To:Cc:Subject:Date; b=Uf2xeFRO7g9PBiiLVAd0EbX/RFmEpy5LNHXWV+dxuBas4skFSG10KZQjpv62hJszN UsItfVdPHQf6fW5FN9VcVZtGFGqYBgxu1LAdHT+VeG2sLqC8J7XTPNKwYtTSmgIW0g Synp2IYa6noupn9Asf1207+a+ifzoWehLDD7KyDo= Received: from localhost.localdomain ([119.147.10.242]) by newxmesmtplogicsvrsza36-0.qq.com (NewEsmtp) with SMTP id C6A06E3C; Tue, 11 Mar 2025 10:49:42 +0800 X-QQ-mid: xmsmtpt1741661382tdm7zvswy Message-ID: X-QQ-XMAILINFO: MIAHdi1iQo+zQH3APbDKHCu1qrQfZdwLGRGEgr3Mq1u4ISFaoem394vkyD+8MC 3ii3aecZNeCnpFSJwpDLLBpg35ZVx7xEExlX9xK6hxKJn+BjjC9ymOssQgEBMYkaGusmDsTs4ZxN rGIBp1dTNdN9+uCxOfLnSi+yjZbYparMCAM2aR5HUZkRSJ9hJxo+Htsd0rssGBm/0c1cN+VXlp6H qQTUKb71QXa7EhkcnsbrFJdLmYesstkzbYC6JdO5k9O1hj7Iw+Mt/kyNfXtRgBF9CVm5oC7LBjEi zZwcxlNe/hEz7Vb6+1eVzRCfuTk92+bHvIa0KzKcycmZRo70NwBBsVCjG6UBSgQPNrz3IpBfZHor wNpInr2S2/R5OndsjQ96d6nEEhVyawX8TMk59kHxgL53+81vKS3v0L7Itgq+0KGJZWTulGYHmx3K /65wgWmHP4JpVkjyrUAygNfgiffrr/N/58NpTmdbzFQkjfWhHq++e2MGdH1CXe7yh5LURgP058Ai cqikCABJMJKRo+gR1/cLfNgkz+GRQgnm+hAui0oRmA9kSrRIoVKUkYU/5s7Tut7wOb2XQCUDJg1S X7YZgmUANsCWuZcLa84rDGJkrQrc9WxCHfP9xYuVjiDhfBYoZ8mKQ8OAAzBuz88IorZTnDy177Y2 GiXy5WbQvcyfU6CYrZYsRz/g+FL+VXxFHvINGsEbL8YYxAUzvl2C9Utf5fjJNJiUDn3+6bZvQk8+ RnjSxhmqPxWtNNTslL+Mp+Monoqr8YSYRbNlxgXS37iFLtz0VOoml8d1NgpvjPyNf3LBEtce0oU6 UeKg2K03MHMTrWMOwFGXd0zwWm9hYpQWV2I87sHXoydcdR34HQme3J3rWfE/ynxw2PVADQFPVPtN qslTJ0pp7W0n+LOVfLUY2Nn3BpdIoPpM3ps4heKlG+0F8MQ/o/rs3P3Z+5qYyTZlqa8MjLxKvzhy UlfjRB6XuiWXis5I4fcoT9N1kKELY8d58L79Ymvy1yUAJUbdNQvw== X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Mar 2025 10:49:41 +0800 X-OQ-MSGID: <20250311024941.27980-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 7/8] avformat/flvdec: Fix error handling of parse_video_color_info 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: Zhao Zhili 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: Zhao Zhili Some error should not be ignored. --- libavformat/flvdec.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index b4d2d7e2b8..b431dabffc 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1194,13 +1194,18 @@ static int flv_parse_video_color_info(AVFormatContext *s, AVStream *st, int64_t // first object needs to be "colorInfo" string type = avio_r8(ioc); - if (type != AMF_DATA_TYPE_STRING || - amf_get_string(ioc, buffer, sizeof(buffer)) < 0) - return TYPE_UNKNOWN; + if (type != AMF_DATA_TYPE_STRING) { + av_log(s, AV_LOG_WARNING, "Ignore invalid colorInfo\n"); + return 0; + } - if (strcmp(buffer, "colorInfo")) { - av_log(s, AV_LOG_DEBUG, "Unknown type %s\n", buffer); - return TYPE_UNKNOWN; + ret = amf_get_string(ioc, buffer, sizeof(buffer)); + if (ret < 0) + return ret; + + if (strcmp(buffer, "colorInfo") != 0) { + av_log(s, AV_LOG_WARNING, "Ignore invalid colorInfo type %s\n", buffer); + return 0; } flv->meta_color_info_flag = FLV_COLOR_INFO_FLAG_PARSING; @@ -1481,8 +1486,9 @@ retry: if (enhanced_flv && (flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) { if (pkt_type == PacketTypeMetadata) { - int sret = flv_parse_video_color_info(s, st, next); - av_log(s, AV_LOG_DEBUG, "enhanced flv parse metadata ret %d and skip\n", sret); + ret = flv_parse_video_color_info(s, st, next); + if (ret < 0) + goto leave; } goto skip; } else if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) { -- 2.46.0 _______________________________________________ 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".