Merged in kdex/main (pull request #357)

Fri, 25 May 2018 23:44:45 +0000

author
Gary Kramlich <grim@reaperworld.com>
date
Fri, 25 May 2018 23:44:45 +0000
changeset 39099
557795de5a15
parent 39093
c3f3cc2538e0 (current diff)
parent 39098
ba681c5cf06c (diff)
child 39100
9ff2a830d8c2

Merged in kdex/main (pull request #357)

gnt: Fix use-after-free memory violation during Python initialization

Approved-by: Gary Kramlich <grim@reaperworld.com>
Approved-by: Eion Robb <eionrobb@gmail.com>

--- a/finch/libgnt/gntwm.c	Fri May 25 01:50:26 2018 -0500
+++ b/finch/libgnt/gntwm.c	Fri May 25 23:44:45 2018 +0000
@@ -1560,13 +1560,7 @@
 				GNT_KEY_F3, NULL);
 	if (!Py_IsInitialized()) {
 #if PY_MAJOR_VERSION >= 3
-		wchar_t *name;
-		size_t len;
-		len = mbstowcs(NULL, "gnt", 0);
-		name = g_new(wchar_t, len + 1);
-		mbstowcs(name, "gnt", len + 1);
-		Py_SetProgramName(name);
-		g_free(name);
+		Py_SetProgramName(L"gnt");
 #else
 		Py_SetProgramName("gnt");
 #endif

mercurial