Fix PythonEngine PYTHONHOME setter

vmuriart · vmuriart · commit 6668ebf5fef1 · 2017-03-02T22:45:39.000-07:00
Keep memory reference &amp; fix PY3 marshal
diff --git a/src/embed_tests/TestPythonEngineProperties.cs b/src/embed_tests/TestPythonEngineProperties.cs
@@ -105,5 +105,30 @@ public static void GetPythonHomeDefault()
             Assert.AreEqual(envPythonHome, enginePythonHome);
             PythonEngine.Shutdown();
         }
+
+        [Test]
+        public void SetPythonHome()
+        {
+            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(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()
         {
@@ -78,7 +79,17 @@ public static string PythonHome
 
                 return result ?? "";
             }
-            set { Runtime.Py_SetPythonHome(value); }
+            set
+            {
+                if (_pythonHome != IntPtr.Zero)
+                {
+                    Marshal.FreeHGlobal(_pythonHome);
+                }
+                _pythonHome = Runtime.IsPython3
+                    ? UcsMarshaler.GetInstance("").MarshalManagedToNative(value)
+                    : Marshal.StringToHGlobalAnsi(value);
+                Runtime.Py_SetPythonHome(_pythonHome);
+            }
         }
 
         public static string PythonPath
@@ -284,6 +295,8 @@ public static void Shutdown()
         {
             if (initialized)
             {
+                Marshal.FreeHGlobal(_pythonHome);
+                _pythonHome = IntPtr.Zero;
                 Runtime.Shutdown();
                 initialized = false;
             }
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -694,9 +694,7 @@ internal static extern void Py_SetProgramName(
         internal static extern IntPtr Py_GetPythonHome();
 
         [DllImport(PythonDll)]
-        internal static extern void Py_SetPythonHome(
-            [MarshalAs(UnmanagedType.LPWStr)] string home
-        );
+        internal static extern void Py_SetPythonHome(IntPtr home);
 
         [DllImport(PythonDll)]
         internal static extern IntPtr Py_GetPath();
@@ -716,7 +714,7 @@ internal static extern void Py_SetPath(
         internal static extern IntPtr Py_GetPythonHome();
 
         [DllImport(PythonDll)]
-        internal static extern void Py_SetPythonHome(string home);
+        internal static extern void Py_SetPythonHome(IntPtr home);
 
         [DllImport(PythonDll)]
         internal static extern IntPtr Py_GetPath();

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`	`{`
`@@ -78,7 +79,17 @@ public static string PythonHome`
`78`	`79`
`79`	`80`	`return result ?? "";`
`80`	`81`	`}`
`81`		`- set { Runtime.Py_SetPythonHome(value); }`
	`82`	`+ set`
	`83`	`+ {`
	`84`	`+ if (_pythonHome != IntPtr.Zero)`
	`85`	`+ {`
	`86`	`+ Marshal.FreeHGlobal(_pythonHome);`
	`87`	`+ }`
	`88`	`+ _pythonHome = Runtime.IsPython3`
	`89`	`+ ? UcsMarshaler.GetInstance("").MarshalManagedToNative(value)`
	`90`	`+ : Marshal.StringToHGlobalAnsi(value);`
	`91`	`+ Runtime.Py_SetPythonHome(_pythonHome);`
	`92`	`+ }`
`82`	`93`	`}`
`83`	`94`
`84`	`95`	`public static string PythonPath`
`@@ -284,6 +295,8 @@ public static void Shutdown()`
`284`	`295`	`{`
`285`	`296`	`if (initialized)`
`286`	`297`	`{`
	`298`	`+ Marshal.FreeHGlobal(_pythonHome);`
	`299`	`+ _pythonHome = IntPtr.Zero;`
`287`	`300`	`Runtime.Shutdown();`
`288`	`301`	`initialized = false;`
`289`	`302`	`}`