From: Georg Brandl <georg@python.org>
Date: Mon, 29 May 2006 14:28:05 +0000 (+0000)
Subject: Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
X-Git-Tag: v2.5b1~364
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b569ee4863bebac6a8c3437563f30f1acd4f34cc;p=thirdparty%2FPython%2Fcpython.git

Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
---

diff --git a/Python/pystrtod.c b/Python/pystrtod.c
index 8a71c285a97d..53d6325f89bb 100644
--- a/Python/pystrtod.c
+++ b/Python/pystrtod.c
@@ -31,6 +31,7 @@
  * is returned (according to the sign of the value), and %ERANGE is
  * stored in %errno. If the correct value would cause underflow,
  * zero is returned and %ERANGE is stored in %errno.
+ * If memory allocation fails, %ENOMEM is stored in %errno.
  * 
  * This function resets %errno before calling strtod() so that
  * you can reliably detect overflow and underflow.
@@ -102,6 +103,12 @@ PyOS_ascii_strtod(const char *nptr, char **endptr)
 
 		/* We need to convert the '.' to the locale specific decimal point */
 		copy = (char *)PyMem_MALLOC(end - nptr + 1 + decimal_point_len);
+		if (copy == NULL) {
+			if (endptr)
+				*endptr = nptr;
+			errno = ENOMEM;
+			return val;
+		}
 
 		c = copy;
 		memcpy(c, nptr, decimal_point_pos - nptr);