Keep reference to PythonHome and dealloc at end

vmuriart · vmuriart · commit 2995a46661df · 2017-03-02T16:41:03.000-07:00
diff --git a/src/embed_tests/TestPythonEngineProperties.cs b/src/embed_tests/TestPythonEngineProperties.cs
@@ -107,12 +107,27 @@ public static void GetPythonHomeDefault()
         }
 
         [Test]
-        public void TestSetHome()
+        public void SetPythonHome()
         {
-            string homePath = @"C:\Python27\";
-            PythonEngine.PythonHome = homePath;
+            var pythonHome = "/dummypath/";
+
+            PythonEngine.PythonHome = pythonHome;
+            PythonEngine.Initialize();
+
+            Assert.AreEqual(pythonHome, PythonEngine.PythonHome);
+            PythonEngine.Shutdown();
+        }
+
+        [Test]
+        public void SetPythonHomeTwice()
+        {
+            var pythonHome = "/dummypath/";
+
+            PythonEngine.PythonHome = "/dummypath2/";
+            PythonEngine.PythonHome = pythonHome;
             PythonEngine.Initialize();
-            Assert.AreEqual(PythonEngine.PythonHome, homePath);
+
+            Assert.AreEqual(pythonHome, PythonEngine.PythonHome);
             PythonEngine.Shutdown();
         }
     }
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -14,6 +14,7 @@ public class PythonEngine : IDisposable
     {
         private static DelegateManager delegateManager;
         private static bool initialized;
+        private static IntPtr _pythonHome = IntPtr.Zero;
 
         public PythonEngine()
         {
@@ -80,8 +81,12 @@ public static string PythonHome
             }
             set
             {
-                IntPtr pythonHome = Marshal.StringToHGlobalAnsi(value);
-                Runtime.Py_SetPythonHome(pythonHome);
+                if (_pythonHome != IntPtr.Zero)
+                {
+                    Marshal.FreeHGlobal(_pythonHome);
+                }
+                _pythonHome = Marshal.StringToHGlobalAnsi(value);
+                Runtime.Py_SetPythonHome(_pythonHome);
             }
         }
 
@@ -288,6 +293,8 @@ public static void Shutdown()
         {
             if (initialized)
             {
+                Marshal.FreeHGlobal(_pythonHome);
+                _pythonHome = IntPtr.Zero;
                 Runtime.Shutdown();
                 initialized = false;
             }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public class PythonEngine : IDisposable`
`14`	`14`	`{`
`15`	`15`	`private static DelegateManager delegateManager;`
`16`	`16`	`private static bool initialized;`
	`17`	`+ private static IntPtr _pythonHome = IntPtr.Zero;`
`17`	`18`
`18`	`19`	`public PythonEngine()`
`19`	`20`	`{`
`@@ -80,8 +81,12 @@ public static string PythonHome`
`80`	`81`	`}`
`81`	`82`	`set`
`82`	`83`	`{`
`83`		`- IntPtr pythonHome = Marshal.StringToHGlobalAnsi(value);`
`84`		`- Runtime.Py_SetPythonHome(pythonHome);`
	`84`	`+ if (_pythonHome != IntPtr.Zero)`
	`85`	`+ {`
	`86`	`+ Marshal.FreeHGlobal(_pythonHome);`
	`87`	`+ }`
	`88`	`+ _pythonHome = Marshal.StringToHGlobalAnsi(value);`
	`89`	`+ Runtime.Py_SetPythonHome(_pythonHome);`
`85`	`90`	`}`
`86`	`91`	`}`
`87`	`92`
`@@ -288,6 +293,8 @@ public static void Shutdown()`
`288`	`293`	`{`
`289`	`294`	`if (initialized)`
`290`	`295`	`{`
	`296`	`+ Marshal.FreeHGlobal(_pythonHome);`
	`297`	`+ _pythonHome = IntPtr.Zero;`
`291`	`298`	`Runtime.Shutdown();`
`292`	`299`	`initialized = false;`
`293`	`300`	`}`