Commit 4f26e7760ac6fe6a9c7a2c01ae466f5b5251d070
2014-12-04T21:41:30
Replaced free() with SDL_free() because related allocation also uses wrapper.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
diff --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c
index 6d85bf0..a74f008 100644
--- a/src/haptic/darwin/SDL_syshaptic.c
+++ b/src/haptic/darwin/SDL_syshaptic.c
@@ -551,7 +551,7 @@ SDL_SYS_HapticOpenFromService(SDL_Haptic * haptic, io_service_t service)
FFReleaseDevice(haptic->hwdata->device);
creat_err:
if (haptic->hwdata != NULL) {
- free(haptic->hwdata);
+ SDL_free(haptic->hwdata);
haptic->hwdata = NULL;
}
return -1;
diff --git a/src/haptic/linux/SDL_syshaptic.c b/src/haptic/linux/SDL_syshaptic.c
index bab3ddb..63c81ab 100644
--- a/src/haptic/linux/SDL_syshaptic.c
+++ b/src/haptic/linux/SDL_syshaptic.c
@@ -441,7 +441,7 @@ SDL_SYS_HapticOpenFromFD(SDL_Haptic * haptic, int fd)
open_err:
close(fd);
if (haptic->hwdata != NULL) {
- free(haptic->hwdata);
+ SDL_free(haptic->hwdata);
haptic->hwdata = NULL;
}
return -1;
@@ -959,7 +959,7 @@ SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
return 0;
new_effect_err:
- free(effect->hweffect);
+ SDL_free(effect->hweffect);
effect->hweffect = NULL;
return -1;
}
diff --git a/src/video/directfb/SDL_DirectFB_video.c b/src/video/directfb/SDL_DirectFB_video.c
index 0d107dc..35379cb 100644
--- a/src/video/directfb/SDL_DirectFB_video.c
+++ b/src/video/directfb/SDL_DirectFB_video.c
@@ -156,7 +156,7 @@ DirectFB_CreateDevice(int devindex)
return device;
error:
if (device)
- free(device);
+ SDL_free(device);
return (0);
}