commit c5db92399467e0fbe08b3e4a12cd5cd7eb29218b
author Georg Brandl <georg@python.org> Thu Jul 12 08:38:04 2007 +0000
committer Georg Brandl <georg@python.org> Thu Jul 12 08:38:04 2007 +0000
tree 1b68ac998fd7302451184a12b981a8ee6bbb0717
parent fea72f7c1098b27b8eacc9d5fdab4288d7f03059

Patch #1673759: add a missing overflow check when formatting floats
with %G.
 (backport from rev. 56298)

Objects/stringobject.c

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index cee78a0..5d343bd 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -4188,7 +4188,8 @@
 	   always given), therefore increase the length by one.
 
 	*/
-	if ((type == 'g' && buflen <= (size_t)10 + (size_t)prec) ||
+	if (((type == 'g' || type == 'G') &&
+              buflen <= (size_t)10 + (size_t)prec) ||
 	    (type == 'f' && buflen <= (size_t)53 + (size_t)prec)) {
 		PyErr_SetString(PyExc_OverflowError,
 			"formatted float is too long (precision too large?)");

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 742db6f..6cc6541 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7290,7 +7290,8 @@
        always given), therefore increase the length by one.
 
     */
-    if ((type == 'g' && buflen <= (size_t)10 + (size_t)prec) ||
+    if (((type == 'g' || type == 'G') && 
+          buflen <= (size_t)10 + (size_t)prec) ||
 	(type == 'f' && buflen <= (size_t)53 + (size_t)prec)) {
 	PyErr_SetString(PyExc_OverflowError,
 			"formatted float is too long (precision too large?)");