From 4f7a4386930ca8aa2ae8a9073480226665d27bff Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 30 Nov 2025 00:05:24 +0300
Subject: [PATCH] update to latest dr_mp3.h from mainstream
---
src/dr_mp3.h | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/dr_mp3.h b/src/dr_mp3.h
index 93e02b5c9..fe81e0814 100644
--- a/src/dr_mp3.h
+++ b/src/dr_mp3.h
@@ -3036,23 +3036,27 @@ static drmp3_bool32 drmp3_init_internal(drmp3* pMP3, drmp3_read_proc onRead, drm
((drmp3_uint32)ape[26] << 16) |
((drmp3_uint32)ape[27] << 24);
- streamEndOffset -= 32 + tagSize;
- streamLen -= 32 + tagSize;
-
- /* Fire a metadata callback for the APE data. Must include both the main content and footer. */
- if (onMeta != NULL) {
- /* We first need to seek to the start of the APE tag. */
- if (onSeek(pUserData, streamEndOffset, DRMP3_SEEK_END)) {
- size_t apeTagSize = (size_t)tagSize + 32;
- drmp3_uint8* pTagData = (drmp3_uint8*)drmp3_malloc(apeTagSize, pAllocationCallbacks);
- if (pTagData != NULL) {
- if (onRead(pUserData, pTagData, apeTagSize) == apeTagSize) {
- drmp3__on_meta(pMP3, DRMP3_METADATA_TYPE_APE, pTagData, apeTagSize);
+ if (32 + tagSize < streamLen) {
+ streamEndOffset -= 32 + tagSize;
+ streamLen -= 32 + tagSize;
+
+ /* Fire a metadata callback for the APE data. Must include both the main content and footer. */
+ if (onMeta != NULL) {
+ /* We first need to seek to the start of the APE tag. */
+ if (onSeek(pUserData, streamEndOffset, DRMP3_SEEK_END)) {
+ size_t apeTagSize = (size_t)tagSize + 32;
+ drmp3_uint8* pTagData = (drmp3_uint8*)drmp3_malloc(apeTagSize, pAllocationCallbacks);
+ if (pTagData != NULL) {
+ if (onRead(pUserData, pTagData, apeTagSize) == apeTagSize) {
+ drmp3__on_meta(pMP3, DRMP3_METADATA_TYPE_APE, pTagData, apeTagSize);
+ }
+
+ drmp3_free(pTagData, pAllocationCallbacks);
}
-
- drmp3_free(pTagData, pAllocationCallbacks);
}
}
+ } else {
+ /* The tag size is larger than the stream. Invalid APE tag. */
}
}
}
@@ -5031,6 +5035,7 @@ REVISION HISTORY
v0.7.2 - TBD
- Reduce stack space to improve robustness on embedded systems.
- Fix a compilation error with MSVC Clang toolset relating to cpuid.
+ - Fix an error with APE tag parsing.
v0.7.1 - 2025-09-10
- Silence a warning with GCC.