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 A0D6644B59 for ; Sat, 13 Dec 2025 19:24:30 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'99aydobySnKz8B8dn2UMwqlhBlhBRPzWPNOPqlDM5Ww=', expected b'aKEMyVACH6/B8rZpGPnYocnJ7hNj+Srs6xl/B0UOwm4=')) 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=1765653856; 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=99aydobySnKz8B8dn2UMwqlhBlhBRPzWPNOPqlDM5Ww=; b=Iy72Wql8WixhZYkIAxq7OeTV8BZnckz0G9fAiJOy7JVNEPiX/hBXDLsdiiyJAjZQyD5yR oehgfKq8FcOWV3LXoO5TuyGDIbpwcBygUyVBz7zxpcL9zjiM1XodM77v3BJy9MJgsV1H0wW QhdcppbkgC50I4/6hPNySb6lWa8ij7LJVp280iZXZ0K2Y9DitYu1aC+eF9f4TB+YNkDbyUd spbVBLpZt2wMXvnnqTMc1+Vyby1e6SyJydSmk/0tcV1HwQiOd+iCrTHbIyvaGlBENg29Dd6 dSWwpCY1DyluE01tTeSRvbFZWF3SmDLh82KK9NKGt6rZ22FIZaBOXB1O6e8g== Received: from [172.19.0.3] (unknown [172.19.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 04D666907F1; Sat, 13 Dec 2025 21:24:16 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1765653832; b=OhYyyzYR42A89FO8i5c0rhyj17amhhsAEGMlcTGQ7T3IhbxOEFR2nsehc7Z1b5uYd/yYT JshZ67773dd/MeoQ04YLSlZCDV6xCWUWeEq4svpDGdVpYvwHC5u5DGyvDdPZwvsHLs04U0G ovkYLDY7xdhUmkUe8FTJYrf5baFWvwGHAcGaYx/diykqcOqaO4TrMpNo03S1GPeJv9hfDI9 /glkJvoN/cFiJD4bfoCikMs0wubHrdIAvJ6ElqZNF4htnmmEiDPzhBQmB8PWJgFLmy71ltK 8RDPY33ml1gs74uu01uepmoQZHGn0KbWwIpX7eZxShf3hojh98+2CwbfY6ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1765653832; 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=FqZZZIEIuLVUe0lp7qZG8MTXeASF+4S3NwnvUNSZQVQ=; b=mpkLmA1riQyIfG/KyNY3V4MOgvrNXpLFlkg8IiQlG2wHmxjfhLZ2VngwEwQCbveqJu105 wuGkz0jzFejso/k0vX1CWV9EmRwHlkqxydDu5UznWmuvXNBaTaldWRzkzQ+DT04VwNcG4/m 4UtKY3g1Xyjq2E1T6Ozym1bgsaP9IxKv0zo5O1AEpYu/7K5ao9plLz4rbqXJjiCglUxGB+k ApUv9cQcossS7VfYwYGwcXpw75thz3KRZGkmQivSyH+o0fLYAHWHF1T08/H1TF9RookEmw8 kU6D6hAxxl9hRgvQpHONhCadiULkihPfSZ+jQlHW0LXYHbA9ejo8s7gP0t1Q== 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=1765653821; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=aKEMyVACH6/B8rZpGPnYocnJ7hNj+Srs6xl/B0UOwm4=; b=tg4E4JI6spk5hHmV3vV3wd/hMeJUWXVp7/v1NhPwIKhTzJVmaRdnMmhQiLXgNqZlRB9dN nT/0jvCMdmnxGzc9x0xB09zCwnTcZlqtfKLMljiWEeSJKYyCeHl1hBruYzhQwaGiNPgftEB y52Xri7ivdIyyJmnNHuvU/vbNS9DBeipAsB1zt/YXy3pTjOh9gYgpf+P8Hj9G3oXbycWdjQ jdu/HkpcMPkFcqwdCM7Auwy/4THR4nguwR1qLFqDoVAkbkHr24tZqlPW4uxCa11jaTYLORM amGmBh898l3I3nKSPwrHHr4thmTFqQ6TEOSX6iiWufaTEMgekY1kY2pwEjsg== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id AED3D69053B for ; Sat, 13 Dec 2025 21:23:41 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Dec 2025 19:23:41 -0000 Message-ID: <176565382197.39.12783497316509127341@2cb04c0e5124> Message-ID-Hash: 4OML46DNXD7GVV6SYJDGYWRVZ25VEZ2K X-Message-ID-Hash: 4OML46DNXD7GVV6SYJDGYWRVZ25VEZ2K X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation 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 X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] libavformat/id3v2.c: return valid string in decode_str for empty strings (PR #21187) 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: toots via ffmpeg-devel Cc: toots Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21187 opened by toots URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21187 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21187.patch >>From 420afb9ef7009231c33663cc9085143fc3d3f6a1 Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Sat, 13 Dec 2025 12:07:19 -0600 Subject: [PATCH] libavformat/id3v2.c: return valid string in decode_str for empty strings with no bom. Fixes: #YWH-PGM40646-12 --- libavformat/id3v2.c | 6 ++---- tests/fate/id3v2.mak | 4 ++++ tests/ref/fate/id3v2-invalid-tags | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 tests/ref/fate/id3v2-invalid-tags diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 9d4a9802a9..5977587b59 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -280,10 +280,8 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding, case 0xfeff: break; case 0: // empty string without bom - ffio_free_dyn_buf(&dynbuf); - *dst = NULL; - *maxread = left; - return 0; + *maxread = 0; + break; default: av_log(s, AV_LOG_ERROR, "Incorrect BOM value: 0x%x\n", bom); ffio_free_dyn_buf(&dynbuf); diff --git a/tests/fate/id3v2.mak b/tests/fate/id3v2.mak index 7ad4d877a4..ce47f19e8d 100644 --- a/tests/fate/id3v2.mak +++ b/tests/fate/id3v2.mak @@ -1,6 +1,10 @@ FATE_ID3V2_FFPROBE-$(CONFIG_MP3_DEMUXER) += fate-id3v2-priv fate-id3v2-priv: CMD = probetags $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 +FATE_ID3V2_FFPROBE-$(CONFIG_MP3_DEMUXER) += fate-id3v2-invalid-tags +fate-id3v2-invalid-tags: $(FFMPEG) +fate-id3v2-invalid-tags: CMD = $(FFMPEG) -nostdin -hide_banner -loglevel fatal -i $(TARGET_SAMPLES)/id3v2/invalid-tags.mp3 -f null - 2>&1 || true + FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, MP3) += fate-id3v2-priv-remux fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 mp3 "-c copy" "-c copy -t 0.1" "-show_entries format_tags" diff --git a/tests/ref/fate/id3v2-invalid-tags b/tests/ref/fate/id3v2-invalid-tags new file mode 100644 index 0000000000..a79ba0cf87 --- /dev/null +++ b/tests/ref/fate/id3v2-invalid-tags @@ -0,0 +1 @@ +Error opening input files: Invalid data found when processing input -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org