From 99e6b0ef00780c9c788d91bdbe3d6ef610db2b62 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 18 Jun 2019 13:41:38 -0700 Subject: [PATCH] Fixed potential double-free in mouse cleanup code --- src/video/cocoa/SDL_cocoamouse.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/video/cocoa/SDL_cocoamouse.m b/src/video/cocoa/SDL_cocoamouse.m index b774626a3..c257be02e 100644 --- a/src/video/cocoa/SDL_cocoamouse.m +++ b/src/video/cocoa/SDL_cocoamouse.m @@ -348,10 +348,9 @@ Cocoa_InitMouse(_THIS) Cocoa_InitMouseEventTap(mouse->driverdata); - SDL_MouseData *driverdata = (SDL_MouseData*)mouse->driverdata; const NSPoint location = [NSEvent mouseLocation]; - driverdata->lastMoveX = location.x; - driverdata->lastMoveY = location.y; + mouse->driverdata->lastMoveX = location.x; + mouse->driverdata->lastMoveY = location.y; } void @@ -482,9 +481,10 @@ Cocoa_QuitMouse(_THIS) if (mouse) { if (mouse->driverdata) { Cocoa_QuitMouseEventTap(((SDL_MouseData*)mouse->driverdata)); - } - SDL_free(mouse->driverdata); + SDL_free(mouse->driverdata); + mouse->driverdata = NULL; + } } }