gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

events: use SDL_memmove instead of SDL_memcpy for overlapping memory

Browse Source
This commit is contained in:
Green Sky
2025-01-14 23:15:14 +01:00
committed by Sam Lantinga
parent bf793bf439
commit 191a6417d5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/events/SDL_keyboard.c
View File

@@ -160,7 +160,7 @@ void SDL_RemoveKeyboard(SDL_KeyboardID keyboardID, bool send_event)
SDL_free(SDL_keyboards[keyboard_index].name); SDL_free(SDL_keyboards[keyboard_index].name);
if (keyboard_index != SDL_keyboard_count - 1) { if (keyboard_index != SDL_keyboard_count - 1) {
SDL_memcpy(&SDL_keyboards[keyboard_index], &SDL_keyboards[keyboard_index + 1], (SDL_keyboard_count - keyboard_index - 1) * sizeof(SDL_keyboards[keyboard_index])); SDL_memmove(&SDL_keyboards[keyboard_index], &SDL_keyboards[keyboard_index + 1], (SDL_keyboard_count - keyboard_index - 1) * sizeof(SDL_keyboards[keyboard_index]));
} }
--SDL_keyboard_count; --SDL_keyboard_count;

4
src/events/SDL_mouse.c
View File

@@ -328,7 +328,7 @@ void SDL_RemoveMouse(SDL_MouseID mouseID, bool send_event)
SDL_free(SDL_mice[mouse_index].name); SDL_free(SDL_mice[mouse_index].name);
if (mouse_index != SDL_mouse_count - 1) { if (mouse_index != SDL_mouse_count - 1) {
SDL_memcpy(&SDL_mice[mouse_index], &SDL_mice[mouse_index + 1], (SDL_mouse_count - mouse_index - 1) * sizeof(SDL_mice[mouse_index])); SDL_memmove(&SDL_mice[mouse_index], &SDL_mice[mouse_index + 1], (SDL_mouse_count - mouse_index - 1) * sizeof(SDL_mice[mouse_index]));
} }
--SDL_mouse_count; --SDL_mouse_count;
@@ -339,7 +339,7 @@ void SDL_RemoveMouse(SDL_MouseID mouseID, bool send_event)
if (source->mouseID == mouseID) { if (source->mouseID == mouseID) {
SDL_free(source->clickstate); SDL_free(source->clickstate);
if (i != mouse->num_sources - 1) { if (i != mouse->num_sources - 1) {
SDL_memcpy(&mouse->sources[i], &mouse->sources[i + 1], (mouse->num_sources - i - 1) * sizeof(mouse->sources[i])); SDL_memmove(&mouse->sources[i], &mouse->sources[i + 1], (mouse->num_sources - i - 1) * sizeof(mouse->sources[i]));
} }
--mouse->num_sources; --mouse->num_sources;
break; break;