commit 7c3b50db6614c677588096191d432e734257a244
author Georg Brandl <georg@python.org> Thu Jul 12 08:38:00 2007 +0000
committer Georg Brandl <georg@python.org> Thu Jul 12 08:38:00 2007 +0000
tree 4cb3d1c23d831f1ed5267210be2164317043fce2
parent bc5fbd9f8c1a271557846d7aa7a428ae25f901e8

Patch #1673759: add a missing overflow check when formatting floats
with %G.

Objects/stringobject.c

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 3870343..504b119 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -4198,7 +4198,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 ad33b8e..85804f1 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7294,7 +7294,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?)");