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

Bug 753992 - im-quartz discard_preedit segmentation fault

Browse Source 
Replace checking if the NSView is really a GdkWindow, which will crash
in the likely event it's not a GObject, with ensuring that the parent
GdkWindow is really a GdkWindowQuartz.
This commit is contained in:
John Ralls 2015-09-18 15:12:24 -07:00 committed by Matthias Clasen
parent 2dad7c1319
commit 571704824f
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/input/imquartz.c
View File

@ -186,15 +186,11 @@ quartz_filter_keypress (GtkIMContext *context,
GTK_NOTE (MISC, g_print ("quartz_filter_keypress\n"));
if (!qc->client_window)
if (!GDK_IS_QUARTZ_WINDOW (qc->client_window))
return FALSE;
nsview = gdk_quartz_window_get_nsview (qc->client_window);
if (GDK_IS_WINDOW (nsview))
/* it gets GDK_WINDOW in some cases */
return gtk_im_context_filter_keypress (qc->slave, event);
else
win = (GdkWindow *)[ (GdkQuartzView *)nsview gdkWindow];
win = (GdkWindow *)[ (GdkQuartzView *)nsview gdkWindow];
GTK_NOTE (MISC, g_print ("client_window: %p, win: %p, nsview: %p\n",
qc->client_window, win, nsview));
@ -242,11 +238,11 @@ discard_preedit (GtkIMContext *context)
if (!qc->client_window)
return;
NSView *nsview = gdk_quartz_window_get_nsview (qc->client_window);
if (!nsview)
if (!GDK_IS_QUARTZ_WINDOW (qc->client_window))
return;
if (GDK_IS_WINDOW (nsview))
NSView *nsview = gdk_quartz_window_get_nsview (qc->client_window);
if (!nsview)
return;
/* reset any partial input for this NSView */
@ -328,11 +324,10 @@ quartz_set_cursor_location (GtkIMContext *context, GdkRectangle *area)
qc->cursor_rect->x = area->x + x;
qc->cursor_rect->y = area->y + y;
nsview = gdk_quartz_window_get_nsview (qc->client_window);
if (GDK_IS_WINDOW (nsview))
/* it returns GDK_WINDOW in some cases */
if (!GDK_IS_QUARTZ_WINDOW (qc->client_window))
return;
nsview = gdk_quartz_window_get_nsview (qc->client_window);
win = (GdkWindow *)[ (GdkQuartzView*)nsview gdkWindow];
g_object_set_data (G_OBJECT (win), GIC_CURSOR_RECT, qc->cursor_rect);
}