diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-28 12:49:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-28 12:49:34 +0200 |
| commit | daa136784d69c224fa60161a8f9d5494e56e9ced (patch) | |
| tree | 320168e7c3608069157adb4ef9538ab802cf6c2e /platform/x11 | |
| parent | bce002f5c3555080cc9edec7fa6650c9f072e632 (diff) | |
| parent | aa174d963df943ba8a763a57a51888e3a37c2fe0 (diff) | |
Merge pull request #19181 from guilhermefelipecgs/fix_memory_leak
Fix memory leak in set_custom_mouse_cursor
Diffstat (limited to 'platform/x11')
| -rw-r--r-- | platform/x11/os_x11.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 7b514d0f90..efa55ddf58 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -2463,7 +2463,7 @@ void OS_X11::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c cursor_image->yhot = p_hotspot.y; // allocate memory to contain the whole file - cursor_image->pixels = (XcursorPixel *)malloc(size); + cursor_image->pixels = (XcursorPixel *)memalloc(size); image->lock(); @@ -2489,6 +2489,9 @@ void OS_X11::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c if (p_shape == CURSOR_ARROW) { XDefineCursor(x11_display, x11_window, cursors[p_shape]); } + + memfree(cursor_image->pixels); + XcursorImageDestroy(cursor_image); } else { // Reset to default system cursor if (img[p_shape]) { |