Commit 15773d23 authored by Chong Yidong's avatar Chong Yidong

(xim_close_dpy): Avoid double-free on X11R6 XIM.

parent 860cd236
......@@ -8319,9 +8319,11 @@ xim_close_dpy (dpyinfo)
XUnregisterIMInstantiateCallback (dpyinfo->display, dpyinfo->xrdb,
NULL, EMACS_CLASS,
xim_instantiate_callback, NULL);
#endif /* not HAVE_X11R6_XIM */
#else /* not HAVE_X11R6_XIM */
/* If we have X11R6 xim, this causes a double-free. */
if (dpyinfo->display)
XCloseIM (dpyinfo->xim);
#endif /* HAVE_X11R6_XIM */
dpyinfo->xim = NULL;
XFree (dpyinfo->xim_styles);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment