- Patchlevel 82

2006-09-05 08:59:54 +00:00 · 2006-09-05 08:59:54 +00:00 · 2b60012cef
commit 2b60012cef
parent 4d267bf30b
1 changed files with 103 additions and 0 deletions
--- a/7.0.082
+++ b/7.0.082
@ -0,0 +1,103 @@
+To: vim-dev@vim.org
+Subject: Patch 7.0.082
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.082
+Problem:    Calling a function that waits for input may cause List and
+	    Dictionary arguments to be freed by the garbage collector.
+Solution:   Keep a list of all arguments to internal functions.
+Files:	    src/eval.c
+
+
+*** ../vim-7.0.081/src/eval.c	Sat Sep  2 13:45:01 2006
+--- src/eval.c	Sun Sep  3 15:36:10 2006
+***************
+*** 248,253 ****
+--- 248,264 ----
+  };
+  
+  /*
+  * Struct used to make a list of all arguments used in internal functions.
+  */
+ typedef struct av_list_item_S av_list_item_T;
+ struct av_list_item_S {
+     av_list_item_T  *avl_next;
+     typval_T	    *avl_argvars;
+ };
+ 
+ av_list_item_T *argvars_list = NULL;
+ 
+ /*
+   * Info used by a ":for" loop.
+   */
+  typedef struct
+***************
+*** 6058,6063 ****
+--- 6069,6075 ----
+      int		i;
+      funccall_T	*fc;
+      int		did_free = FALSE;
+     av_list_item_T *av;
+  #ifdef FEAT_WINDOWS
+      tabpage_T	*tp;
+  #endif
+***************
+*** 6094,6099 ****
+--- 6106,6116 ----
+  	set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID);
+      }
+  
+     /* arguments for internal functions */
+     for (av = argvars_list; av != NULL; av = av->avl_next)
+ 	for (i = 0; av->avl_argvars[i].v_type != VAR_UNKNOWN; ++i)
+ 	    set_ref_in_item(&av->avl_argvars[i], copyID);
+ 
+      /*
+       * 2. Go through the list of dicts and free items without the copyID.
+       */
+***************
+*** 7537,7545 ****
+--- 7554,7574 ----
+  		    error = ERROR_TOOMANY;
+  		else
+  		{
+ 		    av_list_item_T  av_list_item;
+ 
+ 		    /* Add the arguments to the "argvars_list" to avoid the
+ 		     * garbage collector not seeing them.  This isn't needed
+ 		     * for user functions, because the arguments are available
+ 		     * in the a: hashtab. */
+ 		    av_list_item.avl_argvars = argvars;
+ 		    av_list_item.avl_next = argvars_list;
+ 		    argvars_list = &av_list_item;
+ 
+  		    argvars[argcount].v_type = VAR_UNKNOWN;
+  		    functions[i].f_func(argvars, rettv);
+  		    error = ERROR_NONE;
+ 
+ 		    argvars_list = av_list_item.avl_next;
+  		}
+  	    }
+  	}
+*** ../vim-7.0.081/src/version.c	Sat Sep  2 17:58:36 2006
+--- src/version.c	Sun Sep  3 15:35:16 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
+ /**/
+     82,
+  /**/
+
+-- 
+Just think of all the things we haven't thought of yet.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///