The branch, master has been updated
via 1025beeef1d7a46340378f7297ae1399f12d9b99 (commit)
from c7a2b31f846f894f35da708d544e072a9e76560e (commit)
- Log -----------------------------------------------------------------
commit 1025beeef1d7a46340378f7297ae1399f12d9b99
Author: Baptiste Coudurier <[email protected]>
AuthorDate: Tue Oct 28 10:59:01 2025 -0700
Commit: Baptiste Coudurier <[email protected]>
CommitDate: Tue Oct 28 10:59:25 2025 -0700
lavf/id3v2: allow empty strings without bom, fixes #20597
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);
-----------------------------------------------------------------------
Summary of changes:
libavformat/id3v2.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
