OSDN > ソフトウェアを探す > Vim > SCM > hg > vim > コミット

Vim
Fork

vim: コミット

Mirror of the Vim source from https://github.com/vim/vim

patch 8.2.4126: crash on exit when built with dynamic Tcl

Commit: https://github.com/vim/vim/commit/afa76e1cf2e7e1f9e1097e345a4272e9ddbf14ad
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jan 17 21:34:38 2022 +0000

patch 8.2.4126: crash on exit when built with dynamic Tcl

Problem: Crash on exit when built with dynamic Tcl and EXITFREE is defined.

(Dominique Pellé)

Solution: Only call Tcl_Finalize() when initialized. (closes #9546)

diff -r 421d345d0189 -r 005ebb9c8b8f src/if_tcl.c

--- a/src/if_tcl.c Mon Jan 17 22:15:04 2022 +0100

+++ b/src/if_tcl.c Mon Jan 17 22:45:04 2022 +0100

		@@ -248,14 +248,6 @@
248	248	#endif
249	249	}
250	250
251		-#if defined(EXITFREE) \|\| defined(PROTO)
252		- void
253		-vim_tcl_finalize(void)
254		-{
255		- Tcl_Finalize();
256		-}
257		-#endif
258		-
259	251	#if defined(DYNAMIC_TCL) \|\| defined(PROTO)
260	252
261	253	static int stubs_initialized = FALSE;

		@@ -287,6 +279,17 @@
287	279	}
288	280	#endif
289	281
	282	+#if defined(EXITFREE) \|\| defined(PROTO)
	283	+ void
	284	+vim_tcl_finalize(void)
	285	+{
	286	+# ifdef DYNAMIC_TCL
	287	+ if (stubs_initialized)
	288	+# endif
	289	+ Tcl_Finalize();
	290	+}
	291	+#endif
	292	+
290	293	void
291	294	tcl_end(void)
292	295	{

diff -r 421d345d0189 -r 005ebb9c8b8f src/version.c

--- a/src/version.c Mon Jan 17 22:15:04 2022 +0100

+++ b/src/version.c Mon Jan 17 22:45:04 2022 +0100

		@@ -751,6 +751,8 @@
751	751	static int included_patches[] =
752	752	{ /* Add new patch number below this line */
753	753	/**/
	754	+ 4126,
	755	+/**/
754	756	4125,
755	757	/**/
756	758	4124,