patch 8.2.3596: crash when using :pedit in Vim9 script
Problem: Crash when using :pedit in Vim9 script.
Solution: Move check for arguments to after checking there are arguments.
(Yegappan Lakshmanan, closes #9134, closes #9135)
diff --git a/src/popupwin.c b/src/popupwin.c
index d86c6c0..59bdf86 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1851,13 +1851,13 @@
int nr;
int i;
- if (in_vim9script()
- && (check_for_string_or_number_or_list_arg(argvars, 0) == FAIL
- || check_for_dict_arg(argvars, 1) == FAIL))
- return NULL;
-
if (argvars != NULL)
{
+ if (in_vim9script()
+ && (check_for_string_or_number_or_list_arg(argvars, 0) == FAIL
+ || check_for_dict_arg(argvars, 1) == FAIL))
+ return NULL;
+
// Check that arguments look OK.
if (argvars[0].v_type == VAR_NUMBER)
{
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 3bc13ad..9f1cdf1 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -1570,5 +1570,16 @@
CheckDefExecAndScriptFailure(lines, 'E486:', 1)
enddef
+" Test for the 'popuppreview' option
+def Test_popuppreview()
+ set previewpopup=height:10,width:60
+ pedit Xfile
+ var id = popup_findpreview()
+ assert_notequal(id, 0)
+ assert_match('Xfile', popup_getoptions(id).title)
+ popup_clear()
+ set previewpopup&
+enddef
+
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
index 19014e6..39a61c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3596,
+/**/
3595,
/**/
3594,