andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Chong Yidong 2008-11-04 16:47:34 +00:00
parent 860cd236ce
commit 15773d23ec
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/xterm.c
View file

@ -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);
}