encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed overlapping memcpy to memmove

This commit is contained in:
Sam Lantinga 2017-10-10 20:11:05 -07:00
parent eb9e6938cc
commit 8446d4a05a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/events/SDL_events.c
View File

@ -705,7 +705,7 @@ SDL_PushEvent(SDL_Event * event)
{ {
event->common.timestamp = SDL_GetTicks(); event->common.timestamp = SDL_GetTicks();
if (SDL_EventOK.callback || SDL_event_watchers_count != 0) { if (SDL_EventOK.callback || SDL_event_watchers_count > 0) {
if (!SDL_event_watchers_lock || SDL_LockMutex(SDL_event_watchers_lock) == 0) { if (!SDL_event_watchers_lock || SDL_LockMutex(SDL_event_watchers_lock) == 0) {
if (SDL_EventOK.callback && !SDL_EventOK.callback(SDL_EventOK.userdata, event)) { if (SDL_EventOK.callback && !SDL_EventOK.callback(SDL_EventOK.userdata, event)) {
if (SDL_event_watchers_lock) { if (SDL_event_watchers_lock) {
@ -731,7 +731,7 @@ SDL_PushEvent(SDL_Event * event)
if (SDL_event_watchers[i].removed) { if (SDL_event_watchers[i].removed) {
--SDL_event_watchers_count; --SDL_event_watchers_count;
if (i < SDL_event_watchers_count) { if (i < SDL_event_watchers_count) {
SDL_memcpy(&SDL_event_watchers[i], &SDL_event_watchers[i+1], (SDL_event_watchers_count - i) * sizeof(SDL_event_watchers[i])); SDL_memmove(&SDL_event_watchers[i], &SDL_event_watchers[i+1], (SDL_event_watchers_count - i) * sizeof(SDL_event_watchers[i]));
} }
} }
} }
@ -831,7 +831,7 @@ SDL_DelEventWatch(SDL_EventFilter filter, void *userdata)
} else { } else {
--SDL_event_watchers_count; --SDL_event_watchers_count;
if (i < SDL_event_watchers_count) { if (i < SDL_event_watchers_count) {
SDL_memcpy(&SDL_event_watchers[i], &SDL_event_watchers[i+1], (SDL_event_watchers_count - i) * sizeof(SDL_event_watchers[i])); SDL_memmove(&SDL_event_watchers[i], &SDL_event_watchers[i+1], (SDL_event_watchers_count - i) * sizeof(SDL_event_watchers[i]));
} }
} }
break; break;