patch 9.1.1528: completion: crash with getcompletion()

chrisbra · chrisbra · commit f2ec8d4afc06 · 2025-07-08T22:12:37.000+02:00
Problem: completion: crash with getcompletion() (zeertzjq) Solution: Don't set may_expand_pattern in f_getcompletion(), unset may_expand_pattern() once it is not longer needed (Girish Palya). fixes: #17680 closes: #17686 Signed-off-by: Girish Palya <girishji@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/cmdexpand.c b/src/cmdexpand.c
@@ -233,7 +233,6 @@ nextwild(
 
     if (xp->xp_numfiles == -1)
     {
-	may_expand_pattern = options & WILD_MAY_EXPAND_PATTERN;
 	pre_incsearch_pos = xp->xp_pre_incsearch_pos;
 #ifdef FEAT_EVAL
 	if (ccline->input_fn && ccline->xp_context == EXPAND_COMMANDS)
@@ -244,7 +243,9 @@ nextwild(
 	else
 #endif
 	{
+	    may_expand_pattern = options & WILD_MAY_EXPAND_PATTERN;
 	    set_expand_context(xp);
+	    may_expand_pattern = FALSE;
 	}
 	cmd_showtail = expand_showtail(xp);
     }
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
@@ -4478,7 +4478,7 @@ func Test_search_complete()
   call feedkeys("gg/Fo\<tab>\<f9>", 'tx')
   call assert_equal(['Foobar', 'FooBARR'], g:compl_info.matches)
   call feedkeys("gg/FO\<tab>\<f9>", 'tx')
-  call assert_equal({},  g:compl_info)
+  call assert_equal({}, g:compl_info)
   call feedkeys("gg/\\cFo\<tab>\<f9>", 'tx')
   call assert_equal(['\cFoobar', '\cFooBAr', '\cFooBARR'], g:compl_info.matches)
 
@@ -4498,7 +4498,12 @@ func Test_search_complete()
   call feedkeys("gg/Fo\<tab>\<f9>", 'tx')
   call assert_equal(['Foobar', 'FooBARR'], g:compl_info.matches)
   call feedkeys("gg/FO\<tab>\<f9>", 'tx')
-  call assert_equal({},  g:compl_info)
+  call assert_equal({}, g:compl_info)
+
+  " Issue #17680 (getcompletion() does not support search completion)
+  let result = getcompletion('%s/', 'cmdline')
+  call assert_equal([], result)
+
   call feedkeys("gg/foob\<tab>\<f9>", 'tx')
   call assert_equal(['foobar', 'foobarr'], g:compl_info.matches)
   call feedkeys("gg/\\Cfo\<tab>\<f9>", 'tx')
@@ -4603,43 +4608,43 @@ func Test_range_complete()
 
   for trig in ["\<tab>", "\<c-z>"]
     call feedkeys($":%s/a{trig}\<f9>", 'xt')
-    call assert_equal(['ab', 'a', 'af'],  g:compl_info.matches)
+    call assert_equal(['ab', 'a', 'af'], g:compl_info.matches)
     call feedkeys($":vim9cmd :%s/a{trig}\<f9>", 'xt')
-    call assert_equal(['ab', 'a', 'af'],  g:compl_info.matches)
+    call assert_equal(['ab', 'a', 'af'], g:compl_info.matches)
   endfor
 
   call feedkeys(":%s/\<c-z>\<f9>", 'xt')
-  call assert_equal({},  g:compl_info)
+  call assert_equal({}, g:compl_info)
 
   for cmd in ['s', 'g']
-    call feedkeys(":1,2" . cmd . "/a\<c-z>\<f9>", 'xt')
-    call assert_equal(['ab', 'a'],  g:compl_info.matches)
+    call feedkeys($":1,2{cmd}/a\<c-z>\<f9>", 'xt')
+    call assert_equal(['ab', 'a'], g:compl_info.matches)
   endfor
 
   1
   call feedkeys(":.,+2s/a\<c-z>\<f9>", 'xt')
-  call assert_equal(['ab', 'a'],  g:compl_info.matches)
+  call assert_equal(['ab', 'a'], g:compl_info.matches)
 
   /f
   call feedkeys(":1,s/b\<c-z>\<f9>", 'xt')
-  call assert_equal(['b', 'ba'],  g:compl_info.matches)
+  call assert_equal(['b', 'ba'], g:compl_info.matches)
 
   /c
   call feedkeys(":\\?,4s/a\<c-z>\<f9>", 'xt')
-  call assert_equal(['a', 'af'],  g:compl_info.matches)
+  call assert_equal(['a', 'af'], g:compl_info.matches)
 
   %s/c/c/
   call feedkeys(":1,\\&s/a\<c-z>\<f9>", 'xt')
-  call assert_equal(['ab', 'a'],  g:compl_info.matches)
+  call assert_equal(['ab', 'a'], g:compl_info.matches)
 
   3
   normal! ma
   call feedkeys(":'a,$s/a\<c-z>\<f9>", 'xt')
-  call assert_equal(['a', 'af'],  g:compl_info.matches)
+  call assert_equal(['a', 'af'], g:compl_info.matches)
 
   " Line number followed by a search pattern ([start]/pattern/[command])
   call feedkeys("3/a\<c-z>\<f9>", 'xt')
-  call assert_equal(['a', 'af', 'ab'],  g:compl_info.matches)
+  call assert_equal(['a', 'af', 'ab'], g:compl_info.matches)
 
   bw!
   call test_override("char_avail", 0)
diff --git a/src/version.c b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1528,
 /**/
     1527,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,6 @@ nextwild(`
`233`	`233`
`234`	`234`	`if (xp->xp_numfiles == -1)`
`235`	`235`	`{`
`236`		`- may_expand_pattern = options & WILD_MAY_EXPAND_PATTERN;`
`237`	`236`	`pre_incsearch_pos = xp->xp_pre_incsearch_pos;`
`238`	`237`	`#ifdef FEAT_EVAL`
`239`	`238`	`if (ccline->input_fn && ccline->xp_context == EXPAND_COMMANDS)`
`@@ -244,7 +243,9 @@ nextwild(`
`244`	`243`	`else`
`245`	`244`	`#endif`
`246`	`245`	`{`
	`246`	`+ may_expand_pattern = options & WILD_MAY_EXPAND_PATTERN;`
`247`	`247`	`set_expand_context(xp);`
	`248`	`+ may_expand_pattern = FALSE;`
`248`	`249`	`}`
`249`	`250`	`cmd_showtail = expand_showtail(xp);`
`250`	`251`	`}`