diff options
| author | Bastien Nocera <hadess@hadess.net> | 2012-05-25 13:21:48 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2012-05-25 14:00:53 +0100 |
| commit | 021993a3b8b1b293956805a5127447796f78944f (patch) | |
| tree | be96514b474e2b2327465cec1b0eb4db13e60e70 | |
| parent | e6095169f91c857c6b844d6d5f7fb69f70d505ce (diff) | |
| download | gnome-settings-daemon-021993a3b8b1b293956805a5127447796f78944f.tar.gz | |
wacom: Fix memleak in get_device_type()
| -rw-r--r-- | plugins/wacom/gsd-wacom-device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/wacom/gsd-wacom-device.c b/plugins/wacom/gsd-wacom-device.c index f1866fbf..62190062 100644 --- a/plugins/wacom/gsd-wacom-device.c +++ b/plugins/wacom/gsd-wacom-device.c @@ -478,10 +478,10 @@ get_device_type (XDeviceInfo *dev) device, prop, 0, 1, False, XA_ATOM, &realtype, &realformat, &nitems, &bytes_after, &data); - if (gdk_error_trap_pop () || rc != Success || realtype == None) { - XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device); + XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device); + + if (gdk_error_trap_pop () || rc != Success || realtype == None) ret = WACOM_TYPE_INVALID; - } XFree (data); |