Fixed clipboard string leaks.

The clipboard string was not by the Win32 and Cocoa ports on terminate.
This commit is contained in:
Camilla Berglund 2013-06-24 14:08:50 +02:00
parent b6b57b5249
commit 2ce9e8e6b2
4 changed files with 8 additions and 3 deletions

View File

@ -101,6 +101,8 @@ See the [GLFW 3.0 documentation](http://www.glfw.org/docs/3.0/).
- Bugfix: The `-Wall` flag was not used with Clang and other GCC compatibles - Bugfix: The `-Wall` flag was not used with Clang and other GCC compatibles
- Bugfix: The default for `GLFW_ALPHA_BITS` was set to zero - Bugfix: The default for `GLFW_ALPHA_BITS` was set to zero
- [Win32] Bugfix: The clipboard string was not freed on terminate
- [Cocoa] Bugfix: The clipboard string was not freed on terminate
- [X11] Bugfix: Override-redirect windows were resized to the desired instead - [X11] Bugfix: Override-redirect windows were resized to the desired instead
of the actual resolution of the selected video mode of the actual resolution of the selected video mode

View File

@ -118,6 +118,8 @@ void _glfwPlatformTerminate(void)
[_glfw.ns.cursor release]; [_glfw.ns.cursor release];
_glfw.ns.cursor = nil; _glfw.ns.cursor = nil;
free(_glfw.ns.clipboardString);
_glfwTerminateJoysticks(); _glfwTerminateJoysticks();
_glfwTerminateContextAPI(); _glfwTerminateContextAPI();

View File

@ -218,6 +218,8 @@ void _glfwPlatformTerminate(void)
_glfw.win32.classAtom = 0; _glfw.win32.classAtom = 0;
} }
free(_glfw.win32.clipboardString);
_glfwTerminateContextAPI(); _glfwTerminateContextAPI();
_glfwTerminateJoysticks(); _glfwTerminateJoysticks();

View File

@ -628,14 +628,13 @@ void _glfwPlatformTerminate(void)
_glfw.x11.cursor = (Cursor) 0; _glfw.x11.cursor = (Cursor) 0;
} }
free(_glfw.x11.selection.string);
_glfwTerminateJoysticks(); _glfwTerminateJoysticks();
_glfwTerminateContextAPI(); _glfwTerminateContextAPI();
terminateDisplay(); terminateDisplay();
if (_glfw.x11.selection.string)
free(_glfw.x11.selection.string);
} }
const char* _glfwPlatformGetVersionString(void) const char* _glfwPlatformGetVersionString(void)