eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed potentially overlapping memcpy() to use memmove()

Browse source
This commit is contained in:
Sam Lantinga 2025-01-14 14:31:20 -08:00
parent 191a6417d5
commit 49dd24e195
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/android/SDL_android.c
View file

@ -883,7 +883,7 @@ static int FindLifecycleEvent(SDL_AndroidLifecycleEvent event)
static void RemoveLifecycleEvent(int index) static void RemoveLifecycleEvent(int index)
{ {
if (index < Android_NumLifecycleEvents - 1) { if (index < Android_NumLifecycleEvents - 1) {
SDL_memcpy(&Android_LifecycleEvents[index], &Android_LifecycleEvents[index+1], (Android_NumLifecycleEvents - index - 1) * sizeof(Android_LifecycleEvents[index])); SDL_memmove(&Android_LifecycleEvents[index], &Android_LifecycleEvents[index+1], (Android_NumLifecycleEvents - index - 1) * sizeof(Android_LifecycleEvents[index]));
} }
--Android_NumLifecycleEvents; --Android_NumLifecycleEvents;
} }

2
src/joystick/hidapi/SDL_hidapi_ps4.c
View file

@ -298,7 +298,7 @@ static bool HIDAPI_DriverPS4_InitDevice(SDL_HIDAPI_Device *device)
j = -1; j = -1;
for (i = 0; i < 12; i += 2) { for (i = 0; i < 12; i += 2) {
j += 1; j += 1;
SDL_memcpy(&serial[j], &device->serial[i], 2); SDL_memmove(&serial[j], &device->serial[i], 2);
j += 2; j += 2;
serial[j] = '-'; serial[j] = '-';
} }

2
src/joystick/hidapi/SDL_hidapi_ps5.c
View file

@ -387,7 +387,7 @@ static bool HIDAPI_DriverPS5_InitDevice(SDL_HIDAPI_Device *device)
j = -1; j = -1;
for (i = 0; i < 12; i += 2) { for (i = 0; i < 12; i += 2) {
j += 1; j += 1;
SDL_memcpy(&serial[j], &device->serial[i], 2); SDL_memmove(&serial[j], &device->serial[i], 2);
j += 2; j += 2;
serial[j] = '-'; serial[j] = '-';
} }

2
src/test/SDL_test_font.c
View file

@ -123,7 +123,7 @@ void SDLTest_TextWindowAddTextWithLength(SDLTest_TextWindow *textwin, const char
if (newline) { if (newline) {
if (textwin->current == textwin->numlines - 1) { if (textwin->current == textwin->numlines - 1) {
SDL_free(textwin->lines[0]); SDL_free(textwin->lines[0]);
SDL_memcpy(&textwin->lines[0], &textwin->lines[1], (textwin->numlines - 1) * sizeof(textwin->lines[1])); SDL_memmove(&textwin->lines[0], &textwin->lines[1], (textwin->numlines - 1) * sizeof(textwin->lines[1]));
textwin->lines[textwin->current] = NULL; textwin->lines[textwin->current] = NULL;
} else { } else {
++textwin->current; ++textwin->current;