Mercurial > vim

diff src/evalvars.c @ 17944:745c02392844 v8.1.1968

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1968: crash when using nested map() Commit: https://github.com/vim/vim/commit/27da7de7c547dbf983ed7dd901ea59be4e7c9ab2 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Sep 3 17:13:37 2019 +0200 patch 8.1.1968: crash when using nested map() Problem: Crash when using nested map(). Solution: Clear the pointer in prepare_vimvar(). (Ozaki Kiichi, closes #4890, closes #4891)
author Bram Moolenaar <Bram@vim.org>
date Tue, 03 Sep 2019 17:15:03 +0200
parents 4d63d47d87ef
children 5c8906f653f5
line wrap: on
line diff
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -489,19 +489,21 @@ get_spellword(list_T *list, char_u **pp)
 
 /*
  * Prepare v: variable "idx" to be used.
- * Save the current typeval in "save_tv".
+ * Save the current typeval in "save_tv" and clear it.
  * When not used yet add the variable to the v: hashtable.
  */
     void
 prepare_vimvar(int idx, typval_T *save_tv)
 {
     *save_tv = vimvars[idx].vv_tv;
+    vimvars[idx].vv_str = NULL;  // don't free it now
     if (vimvars[idx].vv_type == VAR_UNKNOWN)
 	hash_add(&vimvarht, vimvars[idx].vv_di.di_key);
 }
 
 /*
  * Restore v: variable "idx" to typeval "save_tv".
+ * Note that the v: variable must have been cleared already.
  * When no longer defined, remove the variable from the v: hashtable.
  */
     void