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 C01844CA7E for ; Tue, 28 Oct 2025 18:02:38 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'N9mAncyNOwVLJ6DbSLMLLj1KQC7EMZFvcP+7IMMe8zo=', expected b'Q+XFoM5S/DGkTDhtrOTxmx6YHa8ecLeeBoOZgRG8JSg=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1761674550; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=N9mAncyNOwVLJ6DbSLMLLj1KQC7EMZFvcP+7IMMe8zo=; b=YBwxjfsRYo57aovgJsQmA/qYHywZNwr401qHzBJ9u/ltukaguXuLoAvNcDHfHvNd0G9Sk +Yk0jF8biFeaQqIeTX2DFyZDvcFzqboCG0z2aIo+b7ztY1LZDWm0Ifmk9ASWLQWjHSiBwuK zzUrLFlKDp0Kz2O4cjRTyQ5Ut2t877kVp3h5WYzywrBHQuygU12VEIOqYiXXYq24YA6DNYc +6lOs1U8XikKuBIDmBHnqEn0rgTPq+AXUDDxmrNzOKNQRSMAtHE0Px2lxD9TIEy7AUGaLT5 /YQG7NeEIN/NwQibDq09rd2mmuO5u92s1gPRgGciTKTHuBKf/zybcyZ0KZyA== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 5480368F788; Tue, 28 Oct 2025 20:02:30 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1761674536; b=BSU4WbSSInqEugfATs3uiXM8RLYIPA8iwV/jTbbKOzb9VVPrW0xel+Ap6VHd7M19vLzhw EWp5Fi/d5YwWM5REUn3ZmT5WezuJJpxulYYvGT0SCyzzv1cXSXo049QlOfWeyM6DZws5k8e g/8d/BkJtFjQfaQTKnI501Nf1ME4Lh9UWy3FkxS37g5aYF04cZ9SpHsFtHHmxvzS5nzVRan +OQGdOBqiU41IN5zs34rWOt4An0tYH5if+NTO8oWaaCAWNMDYGDFK/gpBfobrQ70dLbkOCN ZZsjYESnwd/8lWQS8b1vLwYTEteVYH+ixRXvvjqXRVJxmw9JnrQhH0YDoFsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1761674536; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=yO7hJZ4wkKBDZsKZrcpsMcp/A4X8mZkBuDvS6QbZD5c=; b=Sh15pK/pqPf0jNLWOqlgyFZmeAhSYYOcA8pJbvpnLY25dyc7R+OTOO8OOcJXUQg4PD1le L4iVezlXDqg1OEQlN/tKwVyYhyLukm1GiM8brX7ond2E4WlGHqWR+BhqJjUHszqEqh/hij6 wOFsPSHEuAR5iuot0mRH6DdH9eXGAUsERULOFFR9TayR6xhgC/V1KYWRuR1ljkw09XhLs8J YyfXPHVM5QzGKwpAYj65d9NXIpH0+x/os6x5nkEHRSkuXk0dLi9kg7i/CuepVaRR5nbk23L gDnQ4oHX8NKEt1i0HTaeSKgEKnjy3/nUZ4qpITENjhu5XtjC6KQbhBnDg+4w== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1761674528; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=Q+XFoM5S/DGkTDhtrOTxmx6YHa8ecLeeBoOZgRG8JSg=; b=Lr1X56w5F/0S1sugKzw1F3v+GxEkZLYW4XUphyF5L5cjF6H5tFxv0N8QvgPNgbzwPkv3q ++jOdkIx6SBXSMk/6bcMVndexJtfYqaXgU8SHu01NvgJgqRILEWIFzu0SMTe7eSgt/RoIFP VuTD7z2PAR7mUuJlMSuZKeMHhP8FCdpPhFHb9umfySEeVKWiaqlZcN3lTMDWFrJhcOawzg/ XnWXKitG9CqPDJCnucaN5uGksoDP4WPv63HYZchH2UdVoW0SakDIK8FQ7bXV5XQTSvCtIG+ 9GRvFccbsP/ZlJBaYmZ3w/ZrL7Lnc2Ic40hFZ0ZKpg9qiW0t+GsKQzw8Xavw== Received: from 02c22a36bd31 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 593A868F66E for ; Tue, 28 Oct 2025 20:02:08 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Oct 2025 18:02:07 -0000 Message-ID: <176167452850.81.1291318136500672648@7d278768979e> Message-ID-Hash: UIVFD5PNPT7L2QEIR2BO7ASUIQZCJU5Y X-Message-ID-Hash: UIVFD5PNPT7L2QEIR2BO7ASUIQZCJU5Y X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] lavf/id3v2: allow empty strings without bom, fixes #20597 (PR #20778) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Baptiste Coudurier via ffmpeg-devel Cc: Baptiste Coudurier Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20778 opened by Baptiste Coudurier (bcoudurier) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20778 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20778.patch >>From 1025beeef1d7a46340378f7297ae1399f12d9b99 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Tue, 28 Oct 2025 10:59:01 -0700 Subject: [PATCH] lavf/id3v2: allow empty strings without bom, fixes #20597 --- libavformat/id3v2.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 21a5d2fbf6..3ce2fadce8 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -268,7 +268,7 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding, case ID3v2_ENCODING_UTF16BOM: if ((left -= 2) < 0) { - av_log(s, AV_LOG_ERROR, "Cannot read BOM value, input too short\n"); + av_log(s, AV_LOG_ERROR, "Cannot read BOM value, input too short %d\n", left); ffio_free_dyn_buf(&dynbuf); *dst = NULL; return AVERROR_INVALIDDATA; @@ -279,6 +279,11 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding, get = avio_rl16; case 0xfeff: break; + case 0: // empty string without bom + ffio_free_dyn_buf(&dynbuf); + *dst = NULL; + *maxread = left; + return 0; default: av_log(s, AV_LOG_ERROR, "Incorrect BOM value: 0x%x\n", bom); ffio_free_dyn_buf(&dynbuf); -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org