# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1602782103 -7200
# Node ID d5ce7dd60dc14fb8f4131ac6b76075fa07ff313c
# Parent  2770f748e76e19444ed03ba92eadf605d2c5f467
patch 8.2.1848: crash when passing a NULL string or list to popup_settext()

Commit: https://github.com/vim/vim/commit/74f8eece5e481220e3c0767487c0bb59fa916ed6
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Oct 15 19:10:56 2020 +0200

    patch 8.2.1848: crash when passing a NULL string or list to popup_settext()

    Problem:    Crashyyyyy passing a NULL string or list to popup_settext().
    Solution:   Check for NULL pointers. (closes https://github.com/vim/vim/issues/7132)

diff --git a/src/popupwin.c b/src/popupwin.c
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1595,14 +1595,16 @@ popup_set_buffer_text(buf_T *buf, typval
     // Add text to the buffer.
     if (text.v_type == VAR_STRING)
     {
+	char_u *s = text.vval.v_string;
+
 	// just a string
-	ml_append_buf(buf, 0, text.vval.v_string, (colnr_T)0, TRUE);
+	ml_append_buf(buf, 0, s == NULL ? (char_u *)"" : s, (colnr_T)0, TRUE);
     }
     else
     {
 	list_T *l = text.vval.v_list;
 
-	if (l->lv_len > 0)
+	if (l != NULL && l->lv_len > 0)
 	{
 	    if (l->lv_first->li_tv.v_type == VAR_STRING)
 		// list of strings
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2363,6 +2363,16 @@ func Test_popup_settext_getline()
   call popup_close(id)
 endfunc
 
+func Test_popup_settext_null()
+  let id = popup_create('', #{ tabpage: 0 })
+  call popup_settext(id, test_null_list())
+  call popup_close(id)
+
+  let id = popup_create('', #{ tabpage: 0 })
+  call popup_settext(id, test_null_string())
+  call popup_close(id)
+endfunc
+
 func Test_popup_hidden()
   new
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1848,
+/**/
     1847,
 /**/
     1846,