emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-27 72c5f71: Avoid segfaults if XIM is set but not xim_styles


From: Eli Zaretskii
Subject: emacs-27 72c5f71: Avoid segfaults if XIM is set but not xim_styles
Date: Sun, 2 Aug 2020 13:22:09 -0400 (EDT)

branch: emacs-27
commit 72c5f71cd45c860299950cd058d8e13b87375741
Author: Grégory Mounié <Gregory.Mounie@imag.fr>
Commit: Eli Zaretskii <eliz@gnu.org>

    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
---
 src/xfns.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xfns.c b/src/xfns.c
index b89fac1..f9a00a6 100644
--- 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.  */



reply via email to

[Prev in Thread] Current Thread [Next in Thread]