patch 8.2.4269: Coverity warns for using a NULL pointer

Problem:    Coverity warns for using a NULL pointer.
Solution:   Check for "name" to not be NULL.

.github/workflows/ci.yml

@@ -530,16 +530,18 @@ jobs:
           call "%VCVARSALL%" ${{ matrix.vcarch }}
           cd src
           echo.
-          echo %COL_GREEN%vim version:%COL_RESET%
+          echo ::group::%COL_GREEN%Vim version:%COL_RESET%
           .\vim --version || exit 1
+          echo ::endgroup::
 
           echo %COL_GREEN%Start testing vim in background.%COL_RESET%
           start cmd /c "cd ..\src2\testdir & nmake -nologo -f Make_dos.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
 
-          echo %COL_GREEN%Test gvim:%COL_RESET%
+          echo ::group::%COL_GREEN%Test gvim:%COL_RESET%
           cd testdir
           nmake -nologo -f Make_dos.mak VIMPROG=..\gvim || exit 1
           cd ..
+          echo ::endgroup::
 
           echo %COL_GREEN%Wait for vim tests to finish.%COL_RESET%
           cd ..\src2\testdir
@@ -552,10 +554,11 @@ jobs:
           set timeout=1
           :exitloop
 
-          echo %COL_GREEN%Test results of vim:%COL_RESET%
+          echo ::group::%COL_GREEN%Test results of vim:%COL_RESET%
           if exist messages type messages
           nmake -nologo -f Make_dos.mak report VIMPROG=..\..\src\vim || exit 1
           if "%timeout%"=="1" (
             echo %COL_RED%Timed out.%COL_RESET%
             exit 1
           )
+          echo ::endgroup::

src/errors.h

@@ -3218,8 +3218,8 @@ EXTERN char e_cannot_import_dot_vim_without_using_as[]
 	INIT(= N_("E1261: Cannot import .vim without using \"as\""));
 EXTERN char e_cannot_import_same_script_twice_str[]
 	INIT(= N_("E1262: Cannot import the same script twice: %s"));
-EXTERN char e_using_autoload_name_in_non_autoload_script_str[]
-	INIT(= N_("E1263: Using autoload name in a non-autoload script: %s"));
+EXTERN char e_cannot_use_name_with_hash_in_vim9_script_use_export_instead[]
+	INIT(= N_("E1263: cannot use name with # in Vim9 script, use export instead"));
 EXTERN char e_autoload_import_cannot_use_absolute_or_relative_path[]
 	INIT(= N_("E1264: Autoload import cannot use absolute or relative path: %s"));
 EXTERN char e_cannot_use_partial_here[]

src/keymap.h

@@ -150,9 +150,7 @@
  */
 enum key_extra
 {
-    KE_NAME = 3		// name of this terminal entry
-
-    , KE_S_UP = 4		// shift-up
+      KE_S_UP = 4		// shift-up
     , KE_S_DOWN = 5		// shift-down
 
     , KE_S_F1 = 6		// shifted function keys
@@ -253,7 +251,8 @@ enum key_extra
     , KE_CSI = 81		// CSI typed directly
     , KE_SNR = 82		// <SNR>
     , KE_PLUG = 83		// <Plug>
-    , KE_CMDWIN = 84		// open command-line window from Command-line Mode
+    , KE_CMDWIN = 84		// open command-line window from Command-line
+				// Mode
 
     , KE_C_LEFT = 85		// control-left
     , KE_C_RIGHT = 86		// control-right

src/testdir/sautest/autoload/auto9.vim

@@ -1,9 +1,9 @@
 vim9script
 
-func auto9#getsome()
+export func Getsome()
   return 'some'
 endfunc
 
-def auto9#add42(count: number): number
+export def Add42(count: number): number
   return count + 42
 enddef

src/testdir/test_autoload.vim

@@ -22,8 +22,8 @@ func Test_source_autoload()
 endfunc
 
 func Test_autoload_vim9script()
-  call assert_equal('some', auto9#getsome())
-  call assert_equal(49, auto9#add42(7))
+  call assert_equal('some', auto9#Getsome())
+  call assert_equal(49, auto9#Add42(7))
 endfunc
 
 

src/testdir/test_ins_complete.vim

@@ -148,7 +148,7 @@ func Test_omni_autoload()
 
   let lines =<< trim END
       vim9script
-      def omni#func(findstart: bool, base: string): any
+      export def Func(findstart: bool, base: string): any
           if findstart
               return 1
           else
@@ -162,7 +162,7 @@ func Test_omni_autoload()
   call writefile(lines, dir .. '/omni.vim')
 
   new
-  setlocal omnifunc=omni#func
+  setlocal omnifunc=omni#Func
   call feedkeys("i\<C-X>\<C-O>\<Esc>", 'xt')
 
   bwipe!

src/testdir/test_vim9_func.vim

@@ -46,7 +46,7 @@ def TestCompilingErrorInTry()
 
   var lines =<< trim END
       vim9script
-      def script#OnlyCompiled()
+      export def OnlyCompiled()
         g:runtime = 'yes'
         invalid
       enddef
@@ -114,7 +114,7 @@ def Test_autoload_name_mismatch()
 
   var lines =<< trim END
       vim9script
-      def scriptX#Function()
+      export def NoFunction()
         # comment
         g:runtime = 'yes'
       enddef
@@ -126,7 +126,7 @@ def Test_autoload_name_mismatch()
   lines =<< trim END
       call script#Function()
   END
-  v9.CheckScriptFailure(lines, 'E746:', 2)
+  v9.CheckScriptFailure(lines, 'E117:', 1)
 
   &rtp = save_rtp
   delete(dir, 'rf')

src/testdir/test_vim9_import.vim

@@ -1614,13 +1614,13 @@ enddef
 def Test_vim9_autoload_full_name()
   var lines =<< trim END
      vim9script
-     def some#gettest(): string
+     export def Gettest(): string
        return 'test'
      enddef
      g:some#name = 'name'
      g:some#dict = {key: 'value'}
 
-     def some#varargs(a1: string, ...l: list<string>): string
+     export def Varargs(a1: string, ...l: list<string>): string
        return a1 .. l[0] .. l[1]
      enddef
   END
@@ -1630,23 +1630,23 @@ def Test_vim9_autoload_full_name()
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Xdir'
 
-  assert_equal('test', g:some#gettest())
+  assert_equal('test', g:some#Gettest())
   assert_equal('name', g:some#name)
   assert_equal('value', g:some#dict.key)
   g:some#other = 'other'
   assert_equal('other', g:some#other)
 
-  assert_equal('abc', some#varargs('a', 'b', 'c'))
+  assert_equal('abc', some#Varargs('a', 'b', 'c'))
 
   # upper case script name works
   lines =<< trim END
      vim9script
-     def Other#getOther(): string
+     export def GetOther(): string
        return 'other'
      enddef
   END
   writefile(lines, 'Xdir/autoload/Other.vim')
-  assert_equal('other', g:Other#getOther())
+  assert_equal('other', g:Other#GetOther())
 
   delete('Xdir', 'rf')
   &rtp = save_rtp
@@ -2020,14 +2020,23 @@ enddef
 
 def Test_autoload_name_wrong()
   var lines =<< trim END
-     vim9script
      def Xscriptname#Func()
      enddef
   END
   writefile(lines, 'Xscriptname.vim')
-  v9.CheckScriptFailure(lines, 'E1263:')
-
+  v9.CheckScriptFailure(lines, 'E746:')
   delete('Xscriptname.vim')
+
+  mkdir('Xdir/autoload', 'p')
+  lines =<< trim END
+     vim9script
+     def somescript#Func()
+     enddef
+  END
+  writefile(lines, 'Xdir/autoload/somescript.vim')
+  assert_fails('source Xdir/autoload/somescript.vim', 'E1263:')
+
+  delete('Xdir', 'rf')
 enddef
 
 def Test_import_autoload_postponed()
@@ -2202,7 +2211,7 @@ def Test_vim9_autoload_disass()
 
   var lines =<< trim END
      vim9script
-     def debugit#test(): string
+     export def Test(): string
        return 'debug'
      enddef
   END
@@ -2210,7 +2219,7 @@ def Test_vim9_autoload_disass()
 
   lines =<< trim END
      vim9script
-     def profileit#test(): string
+     export def Test(): string
        return 'profile'
      enddef
   END
@@ -2218,10 +2227,10 @@ def Test_vim9_autoload_disass()
 
   lines =<< trim END
     vim9script
-    assert_equal('debug', debugit#test())
-    disass debugit#test
-    assert_equal('profile', profileit#test())
-    disass profileit#test
+    assert_equal('debug', debugit#Test())
+    disass debugit#Test
+    assert_equal('profile', profileit#Test())
+    disass profileit#Test
   END
   v9.CheckScriptSuccess(lines)
 
@@ -2233,7 +2242,7 @@ enddef
 def Test_vim9_aucmd_autoload()
   var lines =<< trim END
      vim9script
-     def foo#test()
+     export def Test()
          echomsg getreg('"')
      enddef
   END
@@ -2243,7 +2252,7 @@ def Test_vim9_aucmd_autoload()
   var save_rtp = &rtp
   exe 'set rtp^=' .. getcwd() .. '/Xdir'
   augroup test
-    autocmd TextYankPost * call foo#test()
+    autocmd TextYankPost * call foo#Test()
   augroup END
 
   normal Y

src/testdir/test_vim9_script.vim

@@ -3078,7 +3078,7 @@ def Test_error_in_autoload_script()
 
   var lines =<< trim END
       vim9script noclear
-      def script#autoloaded()
+      export def Autoloaded()
       enddef
       def Broken()
         var x: any = ''
@@ -3091,7 +3091,7 @@ def Test_error_in_autoload_script()
   lines =<< trim END
       vim9script
       def CallAutoloaded()
-        script#autoloaded()
+        script#Autoloaded()
       enddef
 
       function Legacy()
@@ -3196,7 +3196,7 @@ func Test_no_redraw_when_restoring_cpo()
 
   let lines =<< trim END
     vim9script
-    def script#func()
+    export def Func()
     enddef
   END
   call mkdir('Xdir/autoload', 'p')
@@ -3206,7 +3206,7 @@ func Test_no_redraw_when_restoring_cpo()
       vim9script
       set cpo+=M
       exe 'set rtp^=' .. getcwd() .. '/Xdir'
-      au CmdlineEnter : ++once timer_start(0, (_) => script#func())
+      au CmdlineEnter : ++once timer_start(0, (_) => script#Func())
       setline(1, 'some text')
   END
   call writefile(lines, 'XTest_redraw_cpo')

src/userfunc.c

@@ -4104,7 +4104,7 @@ define_function(exarg_T *eap, char_u *name_arg, garray_T *lines_to_free)
 {
     int		j;
     int		c;
-    int		saved_did_emsg;
+    int		saved_did_emsg = FALSE;
     char_u	*name = name_arg;
     int		is_global = FALSE;
     char_u	*p;
@@ -4232,6 +4232,12 @@ define_function(exarg_T *eap, char_u *name_arg, garray_T *lines_to_free)
 		name = prefixed;
 	    }
 	}
+	else if (vim9script && name != NULL
+				    && vim_strchr(name, AUTOLOAD_CHAR) != NULL)
+	{
+	    emsg(_(e_cannot_use_name_with_hash_in_vim9_script_use_export_instead));
+	    goto ret_free;
+	}
     }
 
     // An error in a function call during evaluation of an expression in magic
@@ -4540,12 +4546,6 @@ define_function(exarg_T *eap, char_u *name_arg, garray_T *lines_to_free)
 		    }
 		}
 	    }
-	    else if (vim9script && vim_strchr(name, AUTOLOAD_CHAR) != NULL)
-	    {
-		semsg(_(e_using_autoload_name_in_non_autoload_script_str),
-									 name);
-		goto erret;
-	    }
 	}
 	if (var_conflict)
 	{

src/version.c

@@ -750,6 +750,18 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4269,
+/**/
+    4268,
+/**/
+    4267,
+/**/
+    4266,
+/**/
+    4265,
+/**/
+    4264,
 /**/
     4263,
 /**/