From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 2574C48B16 for ; Wed, 16 Jul 2025 03:58:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 9071968DDDA; Wed, 16 Jul 2025 06:57:57 +0300 (EEST) Received: from xmbghk7.mail.qq.com (xmbghk7.mail.qq.com [43.163.128.49]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 4574E68DC7A for ; Wed, 16 Jul 2025 06:57:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1752638260; bh=lSjbE7FsyFPMJdbnzCYW8BlDIdZnFmG8/4kSJWq4qHg=; h=From:To:Cc:Subject:Date; b=cCueWJZu3ugMlaV88hnKGAfpbkIra9S0RnpUa8cmyOZNT31p+KjNwAZKbgSrfruQW iXYH9ZUQVOp/maBq4AkQbjSIqKZjFTMCj3LwxjPRfztyKVXWPbN+iyMTZqfm8vFgLy VsV5H7KwOxKKdqM4yEJ5DJgDmOIxLLhh0DPTlaOs= Received: from localhost.localdomain ([119.147.10.242]) by newxmesmtplogicsvrszc16-0.qq.com (NewEsmtp) with SMTP id E66854AF; Wed, 16 Jul 2025 11:57:38 +0800 X-QQ-mid: xmsmtpt1752638258tn15ixk3a Message-ID: X-QQ-XMAILINFO: OQhZ3T0tjf0a9PmvFxEku7n5zbS359SC9Ch2nfovr+sjKPUR53azhZON0akJV4 QD8+R986e6hkm0zo5xcp+wOpKMeXTrBGgSHrFmBefWMDkhw0tBSLHT/SLJoMBoqegOq8M+YK+hhW kW3aTT4YHrZr4rsb/OvmjbTWoEsQQUwPphVk7CgfCnCs09RNyponkkjssMz7toipzPzk2wZSp7OM 8INAsNRnQhUFB6fg31VhmWwnuXcLr5BUVXqhjOTbkWQGnJQFbH69TUGTqx31L0FT0GArZeFSmY9h mQCEm1xLb5LkYI6DhWofnVV3B1WGc4jDYjGqGvOeYacpmi5sb36gvuacPnbVI6Lw6MH8VTBdlBDs m/C+u6Vd0y7Uf2Cn8dPzYL/F4FPaODJkIY8/doZHQH5/qzXxu1cazzcbFRa25BbYB8YnVf6caQAH tNSHabnC/xLDSOCS5Ji7JymGpsiamLAPDHL1Lf2epGmEJhffsVZFUsyR7UWIzF/7R/MSvZKsGD9F 6hqE6QOoYDf04P+Sf7Obd6s+6jHT1ofWu92EK+YxZIzNO/8G7s6V5QYL2VJ/N3HGxcHv/lpE/U7K TTd7knxIBOsghvEcjO5NtkisG5f4NdGm1ueIpgcylximYYuoRo+pjQzdFhtOrcraSCMlLtWyu7H0 cT+oOm7RhFPz7lAZSg+lSZrBgvnmjjgCTufRfRN3XxLyKWuBxMgZboWgUXd2qbeQXmtu+s7w+1Yt b7NfuFgpNcx54zOwM0MVR0NawtFei8GCgGyodxCUmPZQZxcS+h27GzhTJT3mpCQ3vVQmNH2I3ffw dIis9zwiT6pM+MwXlAiRvj7CaiNIMhk2iyKJQPyXxKqUT9qzFHMWrsc4c6luShyPny6B9T8y/Bst d9thHZlHvU5vDwUToJfXbKxc/MHNT1YOHnVi5KB+dsMH3av7iGghNKY9iZly1OS0hck60jGlzys5 VDzpxwNZT+xE//tDGe1fBpgyKnYPo1T42x2Zt5uuuo57tLj6CJMtq8bQK4casX X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jul 2025 11:57:36 +0800 X-OQ-MSGID: <20250716035736.91253-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mxfenc: Ensure keyframe offset in valid range 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 Fix assert failure. Fix #11666. --- libavformat/mxfenc.c | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index d12ccfd739..fbfa49693b 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1983,7 +1983,17 @@ static unsigned klv_fill_size(uint64_t size) return pad & (KAG_SIZE-1); } -static void mxf_write_index_table_segment(AVFormatContext *s) +static inline int mxf_check_keyframe_offset(AVFormatContext *s, int offset) +{ + if (offset >= INT8_MIN && offset <= INT8_MAX) + return 0; + + av_log(s, AV_LOG_ERROR, "keyframe offset %d out of range [%d,%d], please reduce " + "encoder GOP size\n", offset, INT8_MIN, INT8_MAX); + return AVERROR_INVALIDDATA; +} + +static int mxf_write_index_table_segment(AVFormatContext *s) { MXFContext *mxf = s->priv_data; AVIOContext *pb = s->pb; @@ -1992,11 +2002,12 @@ static void mxf_write_index_table_segment(AVFormatContext *s) int prev_non_b_picture = 0; int audio_frame_size = 0; int64_t pos; + int err; av_log(s, AV_LOG_DEBUG, "edit units count %d\n", mxf->edit_units_count); if (!mxf->edit_units_count && !mxf->edit_unit_byte_count) - return; + return 0; avio_write(pb, index_table_segment_key, 16); @@ -2100,9 +2111,17 @@ static void mxf_write_index_table_segment(AVFormatContext *s) avio_w8(pb, temporal_offset); if ((mxf->index_entries[i].flags & 0x30) == 0x30) { // back and forward prediction + int offset = mxf->last_key_index - i; + err = mxf_check_keyframe_offset(s, offset); + if (err < 0) + return err; sc->b_picture_count = FFMAX(sc->b_picture_count, i - prev_non_b_picture); - avio_w8(pb, mxf->last_key_index - i); + avio_w8(pb, offset); } else { + int offset = key_index - i; + err = mxf_check_keyframe_offset(s, offset); + if (err < 0) + return err; avio_w8(pb, key_index - i); // key frame offset if ((mxf->index_entries[i].flags & 0x20) == 0x20) // only forward mxf->last_key_index = key_index; @@ -2127,6 +2146,8 @@ static void mxf_write_index_table_segment(AVFormatContext *s) } mxf_update_klv_size(pb, pos); + + return 0; } static void mxf_write_klv_fill(AVFormatContext *s) @@ -3354,7 +3375,9 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) if ((err = mxf_write_partition(s, 1, 2, header_open_partition_key, 1)) < 0) return err; mxf_write_klv_fill(s); - mxf_write_index_table_segment(s); + err = mxf_write_index_table_segment(s); + if (err < 0) + return err; } else { if ((err = mxf_write_partition(s, 0, 0, header_open_partition_key, 1)) < 0) return err; @@ -3370,7 +3393,9 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) if ((err = mxf_write_partition(s, 1, 2, body_partition_key, 0)) < 0) return err; mxf_write_klv_fill(s); - mxf_write_index_table_segment(s); + err = mxf_write_index_table_segment(s); + if (err < 0) + return err; } mxf_write_klv_fill(s); @@ -3455,7 +3480,9 @@ static int mxf_write_footer(AVFormatContext *s) if ((err = mxf_write_partition(s, 0, 2, footer_partition_key, 0)) < 0) return err; mxf_write_klv_fill(s); - mxf_write_index_table_segment(s); + err = mxf_write_index_table_segment(s); + if (err < 0) + return err; } mxf_write_klv_fill(s); @@ -3474,7 +3501,9 @@ static int mxf_write_footer(AVFormatContext *s) if ((err = mxf_write_partition(s, 1, 2, header_closed_partition_key, 1)) < 0) return err; mxf_write_klv_fill(s); - mxf_write_index_table_segment(s); + err = mxf_write_index_table_segment(s); + if (err < 0) + return err; } else { if ((err = mxf_write_partition(s, 0, 0, header_closed_partition_key, 1)) < 0) return err; -- 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".