len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Bugfix] metadata.c copy_mp3entry() dest and orig may overlap

Browse source 
I meant to add this with the last patch b07d7d6
since it may supply UNBUFFERED_ID3 to the peek function
which uses UNBUFFERED_ID3 and will try to copy it back
wich is undefined behavior for memcpy

Change-Id: I91160570adac22134c84d3b37f8fcecb097d87d6
This commit is contained in:
William Wilgus 2024-12-26 01:23:21 -05:00 • committed by William Wilgus
parent b07d7d6af0
commit 1643e0e287
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/rbcodec/metadata/metadata.c
View file

@ -522,8 +522,11 @@ void adjust_mp3entry(struct mp3entry *entry, void *dest, const void *orig)
void copy_mp3entry(struct mp3entry *dest, const struct mp3entry *orig) void copy_mp3entry(struct mp3entry *dest, const struct mp3entry *orig)
{ {
memcpy(dest, orig, sizeof(struct mp3entry)); if (dest != orig)
adjust_mp3entry(dest, dest, orig); {
memcpy(dest, orig, sizeof(struct mp3entry));
adjust_mp3entry(dest, dest, orig);
}
} }
/* A shortcut to simplify the common task of clearing the struct */ /* A shortcut to simplify the common task of clearing the struct */