AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use free() to free XIButtonState.mask

Browse Source 
XIQueryPointer() allocates it using malloc() (without any mention
in the documentation...).
This commit is contained in:
Matthias Clasen 2011-01-29 23:26:34 -05:00
parent 10b6afa1f5
commit b1be543ba5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdk/x11/gdkdevice-xi2.c
View File

@ -26,6 +26,7 @@
#include "gdkasync.h" #include "gdkasync.h"
#include "gdkprivate-x11.h" #include "gdkprivate-x11.h"
#include <stdlib.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/extensions/XInput2.h> #include <X11/extensions/XInput2.h>
@ -362,7 +363,7 @@ gdk_x11_device_xi2_query_state (GdkDevice *device,
if (mask) if (mask)
*mask = _gdk_x11_device_xi2_translate_state (&mod_state, &button_state); *mask = _gdk_x11_device_xi2_translate_state (&mod_state, &button_state);
g_free (button_state.mask); free (button_state.mask);
return TRUE; return TRUE;
} }
@ -531,7 +532,7 @@ gdk_x11_device_xi2_window_at_position (GdkDevice *device,
XSetWindowAttributes attributes; XSetWindowAttributes attributes;
Window w; Window w;
g_free (button_state.mask); free (button_state.mask);
w = XCreateWindow (xdisplay, xwindow, (int)xwin_x, (int)xwin_y, 1, 1, 0, w = XCreateWindow (xdisplay, xwindow, (int)xwin_x, (int)xwin_y, 1, 1, 0,
CopyFromParent, InputOnly, CopyFromParent, CopyFromParent, InputOnly, CopyFromParent,
@ -566,7 +567,7 @@ gdk_x11_device_xi2_window_at_position (GdkDevice *device,
while (xwindow) while (xwindow)
{ {
last = xwindow; last = xwindow;
g_free (button_state.mask); free (button_state.mask);
gdk_x11_display_error_trap_push (display); gdk_x11_display_error_trap_push (display);
XIQueryPointer (xdisplay, XIQueryPointer (xdisplay,
@ -603,7 +604,7 @@ gdk_x11_device_xi2_window_at_position (GdkDevice *device,
if (mask) if (mask)
*mask = _gdk_x11_device_xi2_translate_state (&mod_state, &button_state); *mask = _gdk_x11_device_xi2_translate_state (&mod_state, &button_state);
g_free (button_state.mask); free (button_state.mask);
return window; return window;
} }