From 648ea76e1d8ca9a9788f88d0d96d0cf0653006bb Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 15 Jan 2021 19:04:32 +0100
Subject: [PATCH] patch 8.2.2357: Vim9: crash when parsing function return type
 fails

Problem:    Vim9: crash when parsing function return type fails.
Solution:   Bail out and set return type to "unknown". (closes #7685)
---
 src/testdir/test_vim9_func.vim | 11 +++++++++++
 src/userfunc.c                 |  6 ++++++
 src/version.c                  |  2 ++
 3 files changed, 19 insertions(+)

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index e87c33e909..049532c69f 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -197,6 +197,17 @@ def Test_return_nothing()
   s:nothing->assert_equal(1)
 enddef
 
+def Test_return_invalid()
+  var lines =<< trim END
+    vim9script
+    def Func(): invalid
+      return xxx
+    enddef
+    defcompile
+  END
+  CheckScriptFailure(lines, 'E1010:', 2)
+enddef
+
 func Increment()
   let g:counter += 1
 endfunc
diff --git a/src/userfunc.c b/src/userfunc.c
index ded9ef7b0f..7ca8186e13 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3886,6 +3886,12 @@ define_function(exarg_T *eap, char_u *name_arg)
 	{
 	    p = ret_type;
 	    fp->uf_ret_type = parse_type(&p, &fp->uf_type_list, TRUE);
+	    if (fp->uf_ret_type == NULL)
+	    {
+		fp->uf_ret_type = &t_void;
+		SOURCING_LNUM = lnum_save;
+		goto erret;
+	    }
 	}
 	SOURCING_LNUM = lnum_save;
     }
diff --git a/src/version.c b/src/version.c
index 9d217e2a06..e7417402fb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2357,
 /**/
     2356,
 /**/