diff options
| author | Grégory Mounié | 2020-08-02 15:56:33 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2020-08-02 20:19:16 +0300 |
| commit | 72c5f71cd45c860299950cd058d8e13b87375741 (patch) | |
| tree | 077330e468943a2295c5e4e89ff9c9fe7bdb2582 /src | |
| parent | f54ddb0198640e38c1d34bf6031ff5117c117c85 (diff) | |
| download | emacs-72c5f71cd45c860299950cd058d8e13b87375741.tar.gz emacs-72c5f71cd45c860299950cd058d8e13b87375741.zip | |
Avoid segfaults if XIM is set but not xim_styles
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index b89fac1cdac..f9a00a6dafd 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -2658,7 +2658,7 @@ create_frame_xic (struct frame *f) | |||
| 2658 | goto out; | 2658 | goto out; |
| 2659 | 2659 | ||
| 2660 | xim = FRAME_X_XIM (f); | 2660 | xim = FRAME_X_XIM (f); |
| 2661 | if (!xim) | 2661 | if (!xim || ! FRAME_X_XIM_STYLES(f)) |
| 2662 | goto out; | 2662 | goto out; |
| 2663 | 2663 | ||
| 2664 | /* Determine XIC style. */ | 2664 | /* Determine XIC style. */ |