Fix memory leak converting floats in converter.cs.

denfromufa · tonyroberts · commit 58bcdf0082d9 · 2016-02-15T09:23:00.000Z
Fixes pythonnet#146
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -578,10 +578,10 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,
                     goto type_error;
                 }
                 ival = Runtime.PyInt_AsLong(op);
+                Runtime.Decref(op);
                 if (ival > Char.MaxValue || ival < Char.MinValue) {
                     goto overflow;
                 }
-                Runtime.Decref(op);
                 result = (char)ival;
                 return true;
 
@@ -644,14 +644,16 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,
                     goto type_error;
                 }
                 uint ui = (uint)Runtime.PyLong_AsUnsignedLong(op);
-                Runtime.Decref(op);
+                
                 if (Exceptions.ErrorOccurred()) {
+                    Runtime.Decref(op);
                     goto overflow;
                 }
 
                 IntPtr check = Runtime.PyLong_FromUnsignedLong(ui);
                 int err = Runtime.PyObject_Compare(check, op);
                 Runtime.Decref(check);
+                Runtime.Decref(op);
                 if (0 != err || Exceptions.ErrorOccurred()) {
                     goto overflow;
                 }
@@ -684,7 +686,8 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,
                     }
                     goto type_error;
                 }
-                double dd = Runtime.PyFloat_AsDouble(value);
+                double dd = Runtime.PyFloat_AsDouble(op);
+                Runtime.Decref(op);
                 if (dd > Single.MaxValue || dd < Single.MinValue) {
                     goto overflow;
                 }

Original file line number	Diff line number	Diff line change
`@@ -578,10 +578,10 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,`
`578`	`578`	`goto type_error;`
`579`	`579`	`}`
`580`	`580`	`ival = Runtime.PyInt_AsLong(op);`
	`581`	`+ Runtime.Decref(op);`
`581`	`582`	`if (ival > Char.MaxValue \|\| ival < Char.MinValue) {`
`582`	`583`	`goto overflow;`
`583`	`584`	`}`
`584`		`- Runtime.Decref(op);`
`585`	`585`	`result = (char)ival;`
`586`	`586`	`return true;`
`587`	`587`
`@@ -644,14 +644,16 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,`
`644`	`644`	`goto type_error;`
`645`	`645`	`}`
`646`	`646`	`uint ui = (uint)Runtime.PyLong_AsUnsignedLong(op);`
`647`		`- Runtime.Decref(op);`
	`647`	`+`
`648`	`648`	`if (Exceptions.ErrorOccurred()) {`
	`649`	`+ Runtime.Decref(op);`
`649`	`650`	`goto overflow;`
`650`	`651`	`}`
`651`	`652`
`652`	`653`	`IntPtr check = Runtime.PyLong_FromUnsignedLong(ui);`
`653`	`654`	`int err = Runtime.PyObject_Compare(check, op);`
`654`	`655`	`Runtime.Decref(check);`
	`656`	`+ Runtime.Decref(op);`
`655`	`657`	`if (0 != err \|\| Exceptions.ErrorOccurred()) {`
`656`	`658`	`goto overflow;`
`657`	`659`	`}`
`@@ -684,7 +686,8 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,`
`684`	`686`	`}`
`685`	`687`	`goto type_error;`
`686`	`688`	`}`
`687`		`- double dd = Runtime.PyFloat_AsDouble(value);`
	`689`	`+ double dd = Runtime.PyFloat_AsDouble(op);`
	`690`	`+ Runtime.Decref(op);`
`688`	`691`	`if (dd > Single.MaxValue \|\| dd < Single.MinValue) {`
`689`	`692`	`goto overflow;`
`690`	`693`	`}`