From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 6 Mar 2015 14:08:44 +0000 (-0500)
Subject: fix potential refleak in PyFloat_AsDouble (closes #23590)
X-Git-Tag: v2.7.10rc1~139
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f050648a505b3810b659ca490c2e418a02c702cc;p=thirdparty%2FPython%2Fcpython.git

fix potential refleak in PyFloat_AsDouble (closes #23590)
---

diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index e6779c4256ad..5bf1d314e910 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -8,6 +8,7 @@ import operator
 import random
 import fractions
 import sys
+import time
 
 INF = float("inf")
 NAN = float("nan")
@@ -164,6 +165,11 @@ class GeneralFloatCases(unittest.TestCase):
         self.assertAlmostEqual(float(FooUnicode('8')), 9.)
         self.assertAlmostEqual(float(FooStr('8')), 9.)
 
+        class Foo5:
+            def __float__(self):
+                return ""
+        self.assertRaises(TypeError, time.sleep, Foo5())
+
     def test_is_integer(self):
         self.assertFalse((1.1).is_integer())
         self.assertTrue((1.).is_integer())
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 2bec0fbc6ffa..0ce7f6ce5cf2 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -271,6 +271,7 @@ PyFloat_AsDouble(PyObject *op)
     if (fo == NULL)
         return -1;
     if (!PyFloat_Check(fo)) {
+        Py_DECREF(fo);
         PyErr_SetString(PyExc_TypeError,
                         "nb_float should return float object");
         return -1;