patch 9.0.0382: freeing the wrong string on failure

Problem:    Freeing the wrong string on failure.
Solution:   Adjust the argument.  Reorder the code.

diff --git a/src/version.c b/src/version.c
index 021694b3c3ccf729c7714acdcdf56f4e5b6fc020..5961413079db2d1d0cbf96e811803e32256eba72 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -703,6 +703,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    382,
 /**/
     381,
 /**/

diff --git a/src/vim9execute.c b/src/vim9execute.c
index 3194f872f4c758d1fb6ade24759727d2b53f119a..08774fee323cdb35f7f1c5e91eeaed8625901324 100644 (file)
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -937,21 +937,22 @@ add_defer_function(char_u *name, int argcount, typval_T *argvars)
     if (dfunc->df_defer_var_idx == 0)
     {
        iemsg("df_defer_var_idx is zero");
-       vim_free(func_tv.vval.v_string);
+       vim_free(name);
        return FAIL;
     }
-    func_tv.v_type = VAR_FUNC;
-    func_tv.v_lock = 0;
-    func_tv.vval.v_string = name;
 
     l = add_defer_item(dfunc->df_defer_var_idx - 1, 1, current_ectx);
     if (l == NULL)
     {
-       vim_free(func_tv.vval.v_string);
+       vim_free(name);
        return FAIL;
     }
 
+    func_tv.v_type = VAR_FUNC;
+    func_tv.v_lock = 0;
+    func_tv.vval.v_string = name;
     list_set_item(l, 0, &func_tv);
+
     for (i = 0; i < argcount; ++i)
        list_set_item(l, i + 1, argvars + i);
     return OK;