From 6ef280fb0f138b3830fbfedbdff4736b2da07707 Mon Sep 17 00:00:00 2001
From: nicm <nicm@openbsd.org>
Date: Sun, 19 Jul 2026 17:25:38 +0000
Subject: [PATCH] Guard x as well as y to avoid overflow, GitHub issue 5409
 from Park Seongjae.

---
 window-visible.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/window-visible.c b/window-visible.c
index 360e4fc88..a49bfa2ef 100644
--- a/window-visible.c
+++ b/window-visible.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-visible.c,v 1.4 2026/06/29 19:03:34 nicm Exp $ */
+/* $OpenBSD: window-visible.c,v 1.5 2026/07/19 17:25:38 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -81,7 +81,7 @@ window_visible_ranges(struct window_pane *base_wp, int px, int py, u_int width,
 	}
 
 	w = base_wp->window;
-	if ((u_int)py >= w->sy)
+	if ((u_int)py >= w->sy || (u_int)px >= w->sx)
 		goto empty;
 	if (px + width > w->sx)
 		width = w->sx - px;