projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f54ddb0
)
Avoid segfaults if XIM is set but not xim_styles
author
Grégory Mounié
<Gregory.Mounie@imag.fr>
Sun, 2 Aug 2020 13:56:33 +0000
(15:56 +0200)
committer
Eli Zaretskii
<eliz@gnu.org>
Sun, 2 Aug 2020 17:19:16 +0000
(20:19 +0300)
Emacs segfaults at the X11 initialization if XIM is set
and xim_styles is NULL. This patch avoids the crash.
* src/xfns.c: Check also if FRAME_X_XIM_STYLES(f) is NULL.
(Bug#42676) (Bug#42673) (Bug#42677)
Copyright-paperwork-exempt: yes
src/xfns.c
patch
|
blob
|
history
diff --git
a/src/xfns.c
b/src/xfns.c
index b89fac1cdac9d3861ff8aaba27192fcefbc6ee5d..f9a00a6dafd9f90bae1b4ca27fcd77740b9f9f09 100644
(file)
--- a/
src/xfns.c
+++ b/
src/xfns.c
@@
-2658,7
+2658,7
@@
create_frame_xic (struct frame *f)
goto out;
xim = FRAME_X_XIM (f);
- if (!xim)
+ if (!xim
|| ! FRAME_X_XIM_STYLES(f)
)
goto out;
/* Determine XIC style. */