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 1DF414456B for ; Wed, 18 Jan 2023 14:31:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C34468B461; Wed, 18 Jan 2023 16:31:47 +0200 (EET) Received: from mailrelay.ngus.net (mailrelay.ngus.net [109.237.26.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51E2B68B435 for ; Wed, 18 Jan 2023 16:31:40 +0200 (EET) Received: from cpc102338-sgyl38-2-0-cust655.18-2.cable.virginm.net ([77.102.34.144] helo=zebop) by mailrelay.ngus.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1pI9TX-00B9BM-NT for ffmpeg-devel@ffmpeg.org; Wed, 18 Jan 2023 14:31:39 +0000 Received: from [192.168.101.3] (helo=localhost.localdomain) by zebop with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pI9TW-00Emf6-6C; Wed, 18 Jan 2023 14:31:39 +0000 From: Tim Angus To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Jan 2023 14:31:13 +0000 Message-Id: <20230118143113.324703-2-tim@ngus.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230118143113.324703-1-tim@ngus.net> References: <20230118143113.324703-1-tim@ngus.net> MIME-Version: 1.0 X-Spam-Score: -2.9 (--) Subject: [FFmpeg-devel] [PATCH] avformat/assenc: fix incorrect copy of null terminator 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: Tim Angus 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: When writing a subtitle SSA/ASS subtitle file, the AVCodecParameters::extradata buffer is written directly to the output, potentially including a null terminating character, which is sometimes present. The result is the output having a null character in the middle; this is addressed here by avoiding copying it. Signed-off-by: Tim Angus --- libavformat/assenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/assenc.c b/libavformat/assenc.c index 1600f0a02b..5e74b84575 100644 --- a/libavformat/assenc.c +++ b/libavformat/assenc.c @@ -69,6 +69,11 @@ static int write_header(AVFormatContext *s) ass->trailer = trailer; } + /* extradata may or may not be null terminated; in the case where + * it is, avoid copying a null into the middle of the buffer */ + while (header_size > 0 && par->extradata[header_size - 1] == '\0') + header_size--; + avio_write(s->pb, par->extradata, header_size); if (par->extradata[header_size - 1] != '\n') avio_write(s->pb, "\r\n", 2); -- 2.25.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".