[X2Go-Commits] [nx-libs] 06/09: nx-X11/programs/Xserver/hw/nxagent/Screen.c: fix intersection break-out.

git-admin at x2go.org git-admin at x2go.org
Mon Jun 4 09:49:04 CEST 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.

commit a8bc1b83b157b13c1ace64c1099f7fb4af128276
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue May 1 23:46:02 2018 +0200

    nx-X11/programs/Xserver/hw/nxagent/Screen.c: fix intersection break-out.
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 5aeee76..c87b637 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -3646,8 +3646,7 @@ static Bool intersect(int ax1, int ay1, unsigned int aw, unsigned int ah,
     /* thanks to http://silentmatt.com/rectangle-intersection */
 
     /* check if there's any intersection at all */
-    if (ax2 < bx1 || bx2 < ax1 || ay2 < by1 || by2 < ay1) {
-
+    if ((ax1 >= bx2) || (ax2 <= bx1) || (ay1 >= by2) || (ay2 <= by1)) {
         #ifdef DEBUG
         fprintf(stderr, "intersect: the given rectangles do not intersect at all\n");
         #endif

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list