vim-patch:8.2.1161: Vim9: using freed memory

Problem:    Vim9: using freed memory.
Solution:   Put pointer back in evalarg instead of freeing it.

https://github.com/vim/vim/commit/8e2730a315b8b06192f5fc822dc218dbb3cff7ae

Omit eval_tofree_lambda: Vim9 script only.

N/A patches for version.c:

vim-patch:8.2.1163: build error

Problem:    Build error.
Solution:   Add missing change to globals.

https://github.com/vim/vim/commit/6e13530ca03dd9cad245221177dd65f712211448

Co-authored-by: Bram Moolenaar <Bram@vim.org>

1 files changed, 14 insertions, 12 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index ec3c2b5e85..9660157592 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2259,21 +2259,23 @@ static int eval_func(char **const arg, evalarg_T *const evalarg, char *const nam
   return ret;
 }
 
-/// After using "evalarg" filled from "eap" free the memory.
+/// After using "evalarg" filled from "eap": free the memory.
 void clear_evalarg(evalarg_T *evalarg, exarg_T *eap)
 {
-  if (evalarg != NULL && evalarg->eval_tofree != NULL) {
-    if (eap != NULL) {
-      // We may need to keep the original command line, e.g. for
-      // ":let" it has the variable names.  But we may also need the
-      // new one, "nextcmd" points into it.  Keep both.
-      xfree(eap->cmdline_tofree);
-      eap->cmdline_tofree = *eap->cmdlinep;
-      *eap->cmdlinep = evalarg->eval_tofree;
-    } else {
-      xfree(evalarg->eval_tofree);
+  if (evalarg != NULL) {
+    if (evalarg->eval_tofree != NULL) {
+      if (eap != NULL) {
+        // We may need to keep the original command line, e.g. for
+        // ":let" it has the variable names.  But we may also need the
+        // new one, "nextcmd" points into it.  Keep both.
+        xfree(eap->cmdline_tofree);
+        eap->cmdline_tofree = *eap->cmdlinep;
+        *eap->cmdlinep = evalarg->eval_tofree;
+      } else {
+        xfree(evalarg->eval_tofree);
+      }
+      evalarg->eval_tofree = NULL;
     }
-    evalarg->eval_tofree = NULL;
   }
 }