emacs-diffs
[Top][All Lists]
Advanced

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

master 823b503c9d: Fix crashes when the _EMACS_DRAG_ATOM is the wrong ty


From: Po Lu
Subject: master 823b503c9d: Fix crashes when the _EMACS_DRAG_ATOM is the wrong type
Date: Sun, 19 Jun 2022 01:32:46 -0400 (EDT)

branch: master
commit 823b503c9da3d69a369bfeb1c2496cd22933360a
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Fix crashes when the _EMACS_DRAG_ATOM is the wrong type
    
    * src/xterm.c (xm_get_drag_atom_1): Don't use PropModeAppend if
    rc != Success.
---
 src/xterm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index d83a56a6cb..455d5b795e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2299,8 +2299,9 @@ xm_get_drag_atom_1 (struct x_display_info *dpyinfo,
 
       XChangeProperty (dpyinfo->display, dpyinfo->root_window,
                       dpyinfo->Xatom_EMACS_DRAG_ATOM, XA_ATOM, 32,
-                      (rc == Success && (actual_format != 32
-                                         || actual_type != XA_ATOM)
+                      (rc != Success
+                       || (actual_format != 32
+                           || actual_type != XA_ATOM)
                        ? PropModeReplace : PropModeAppend),
                       (unsigned char *) &atom, 1);
 



reply via email to

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