commit fd318115a5ee813cba69aa7fc7f5f42f08f10ee4
author Bram Moolenaar <Bram@vim.org> Fri Nov 22 19:22:08 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Fri Nov 22 19:22:08 2019 +0100
tree 370e8f8846be090afb874d1a47db52d41d838a82
parent 828ffd596394f714270a01a55fc3f949a8bd9b35

patch 8.1.2334: possible NULL pointer dereference in popup_locate()

Problem:    Possible NULL pointer dereference in popup_locate(). (Coverity)
Solution:   Check for NULL pointer.

src/popupwin.c

diff --git a/src/popupwin.c b/src/popupwin.c
index efcc395..3b808e2 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2599,7 +2599,7 @@
     win_T	*wp;
 
     wp = mouse_find_win(&row, &col, FIND_POPUP);
-    if (WIN_IS_POPUP(wp))
+    if (wp != NULL && WIN_IS_POPUP(wp))
 	rettv->vval.v_number = wp->w_id;
 }
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 9037349..c327f98 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2334,
+/**/
     2333,
 /**/
     2332,