fixed bug of Exec method pythonnet#591

yagweb · yagweb · commit c6cc3daa339b · 2018-01-10T16:36:22.000+08:00
diff --git a/src/embed_tests/pyrunstring.cs b/src/embed_tests/pyrunstring.cs
@@ -57,5 +57,20 @@ public void TestExec()
             object c = locals.GetItem("c").AsManagedObject(typeof(int));
             Assert.AreEqual(111, c);
         }
+
+        [Test]
+        public void TestExec2()
+        {
+            string code = @"
+class Test1():
+   pass
+
+class Test2():
+   def __init__(self):
+       Test1()
+
+Test2()";
+            PythonEngine.Exec(code);
+        }
     }
 }
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -496,12 +496,10 @@ internal static PyObject RunString(string code, IntPtr? globals, IntPtr? locals,
                     borrowedGlobals = false;
                 }
             }
-
-            var borrowedLocals = true;
+            
             if (locals == null)
             {
-                locals = Runtime.PyDict_New();
-                borrowedLocals = false;
+                locals = globals;
             }
 
             try
@@ -516,10 +514,6 @@ internal static PyObject RunString(string code, IntPtr? globals, IntPtr? locals,
             }
             finally
             {
-                if (!borrowedLocals)
-                {
-                    Runtime.XDecref(locals.Value);
-                }
                 if (!borrowedGlobals)
                 {
                     Runtime.XDecref(globals.Value);

Original file line number	Diff line number	Diff line change
`@@ -496,12 +496,10 @@ internal static PyObject RunString(string code, IntPtr? globals, IntPtr? locals,`
`496`	`496`	`borrowedGlobals = false;`
`497`	`497`	`}`
`498`	`498`	`}`
`499`		`-`
`500`		`- var borrowedLocals = true;`
	`499`	`+`
`501`	`500`	`if (locals == null)`
`502`	`501`	`{`
`503`		`- locals = Runtime.PyDict_New();`
`504`		`- borrowedLocals = false;`
	`502`	`+ locals = globals;`
`505`	`503`	`}`
`506`	`504`
`507`	`505`	`try`
`@@ -516,10 +514,6 @@ internal static PyObject RunString(string code, IntPtr? globals, IntPtr? locals,`
`516`	`514`	`}`
`517`	`515`	`finally`
`518`	`516`	`{`
`519`		`- if (!borrowedLocals)`
`520`		`- {`
`521`		`- Runtime.XDecref(locals.Value);`
`522`		`- }`
`523`	`517`	`if (!borrowedGlobals)`
`524`	`518`	`{`
`525`	`519`	`Runtime.XDecref(globals.Value);`