# HG changeset patch # User Edgar Simo # Date 1217524296 0 # Node ID 57ea8810b5f0338898a45c016db5d48026b9c509 # Parent c1f07fdd1e2d72702572bebb562b58ba8410e1c6 Fixed some stray memcpy and free. diff -r c1f07fdd1e2d -r 57ea8810b5f0 src/haptic/win32/SDL_syshaptic.c --- a/src/haptic/win32/SDL_syshaptic.c Thu Jul 31 16:38:13 2008 +0000 +++ b/src/haptic/win32/SDL_syshaptic.c Thu Jul 31 17:11:36 2008 +0000 @@ -166,7 +166,7 @@ static BOOL CALLBACK EnumHapticsCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext) { - memcpy(&SDL_hapticlist[SDL_numhaptics].instance, pdidInstance, + SDL_memcpy(&SDL_hapticlist[SDL_numhaptics].instance, pdidInstance, sizeof(DIDEVICEINSTANCE)); SDL_numhaptics++; @@ -376,7 +376,7 @@ IDirectInputDevice2_Release(haptic->hwdata->device); creat_err: if (haptic->hwdata != NULL) { - free(haptic->hwdata); + SDL_free(haptic->hwdata); haptic->hwdata = NULL; } return -1;