From ca09b5858e56efa301bb074f777310d2fd7b2386 Mon Sep 17 00:00:00 2001
From: okan
Date: Mon, 12 Aug 2019 00:52:36 +0000
Subject: Fix regression from r1.107 (lost a return); kettenis@ pointed out the
 high potential for a use-after-free (true!) where kn@ ran into the regression
 using an app that actually exercised the XGrabPointer() failure path.

---
 menu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/menu.c b/menu.c
index a2ecf03..2a7afc8 100644
--- a/menu.c
+++ b/menu.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: menu.c,v 1.107 2019/03/04 19:28:18 okan Exp $
+ * $OpenBSD: menu.c,v 1.108 2019/08/12 00:52:36 okan Exp $
  */
 
 #include <sys/types.h>
@@ -129,6 +129,7 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, const char *prompt,
 	    CurrentTime) != GrabSuccess) {
 		XftDrawDestroy(mc.xftdraw);
 		XDestroyWindow(X_Dpy, mc.win);
+		return(NULL);
 	}
 
 	XGetInputFocus(X_Dpy, &focuswin, &focusrevert);
-- 
cgit v1.2.3-2-gb3c3