patch 8.2.0826: Vim9: crash in :defcompile

Problem:    Vim9: crash in :defcompile.
Solution:   Restart the loop after a call to compile_def_function() caused the
            hash table to resize.

diff --git a/src/userfunc.c b/src/userfunc.c
index c50a871c2b64e64e87262ded6b6ccd75006b65a8..4a12c1984cecc63e196289b7ee6ad3f9e41385d5 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3326,7 +3326,8 @@ ex_function(exarg_T *eap)
     void
 ex_defcompile(exarg_T *eap UNUSED)
 {
-    int                todo = (int)func_hashtab.ht_used;
+    long_u     ht_used = func_hashtab.ht_used;
+    int                todo = (int)ht_used;
     hashitem_T *hi;
     ufunc_T    *ufunc;
 
@@ -3338,7 +3339,17 @@ ex_defcompile(exarg_T *eap UNUSED)
            ufunc = HI2UF(hi);
            if (ufunc->uf_script_ctx.sc_sid == current_sctx.sc_sid
                    && ufunc->uf_dfunc_idx == UF_TO_BE_COMPILED)
+           {
                compile_def_function(ufunc, FALSE, NULL);
+
+               if (func_hashtab.ht_used != ht_used)
+               {
+                   // another function has been defined, need to start over
+                   hi = func_hashtab.ht_array;
+                   ht_used = func_hashtab.ht_used;
+                   todo = (int)ht_used;
+               }
+           }
        }
     }
 }

diff --git a/src/version.c b/src/version.c
index 5ccbfad01e0069f751c19b48af5326a41d9f6ada..173087551427b8175a9bba55abf14b2ffdaaf119 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    826,
 /**/
     825,
 /**/