doubletounicode(), longtounicode():

tim-one · tim-one · commit 2001bba93893 · 2006-02-16T01:08:01.000Z
Py_SAFE_DOWNCAST can evaluate its first argument multiple
times in a debug build.  This caused two distinct assert-
failures in test_unicode run under a debug build.  Rewrote
the code in trivial ways so that multiple evaluation of the
first argument doesn't hurt.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -6601,17 +6601,21 @@ strtounicode(Py_UNICODE *buffer, const char *charbuffer)
 static int
 doubletounicode(Py_UNICODE *buffer, size_t len, const char *format, double x)
 {
+    Py_ssize_t result;
+
     PyOS_ascii_formatd((char *)buffer, len, format, x);
-    return Py_SAFE_DOWNCAST(strtounicode(buffer, (char *)buffer),
-                            Py_ssize_t, int);
+    result = strtounicode(buffer, (char *)buffer);
+    return Py_SAFE_DOWNCAST(result, Py_ssize_t, int);
 }
 
 static int
 longtounicode(Py_UNICODE *buffer, size_t len, const char *format, long x)
 {
+    Py_ssize_t result;
+
     PyOS_snprintf((char *)buffer, len, format, x);
-    return Py_SAFE_DOWNCAST(strtounicode(buffer, (char *)buffer),
-                            Py_ssize_t, int);
+    result = strtounicode(buffer, (char *)buffer);
+    return Py_SAFE_DOWNCAST(result, Py_ssize_t, int);
 }
 
 /* XXX To save some code duplication, formatfloat/long/int could have been

Original file line number	Diff line number	Diff line change
`@@ -6601,17 +6601,21 @@ strtounicode(Py_UNICODE buffer, const char charbuffer)`
`6601`	`6601`	`static int`
`6602`	`6602`	`doubletounicode(Py_UNICODE buffer, size_t len, const char format, double x)`
`6603`	`6603`	`{`
	`6604`	`+ Py_ssize_t result;`
	`6605`	`+`
`6604`	`6606`	`PyOS_ascii_formatd((char *)buffer, len, format, x);`
`6605`		`- return Py_SAFE_DOWNCAST(strtounicode(buffer, (char *)buffer),`
`6606`		`- Py_ssize_t, int);`
	`6607`	`+ result = strtounicode(buffer, (char *)buffer);`
	`6608`	`+ return Py_SAFE_DOWNCAST(result, Py_ssize_t, int);`
`6607`	`6609`	`}`
`6608`	`6610`
`6609`	`6611`	`static int`
`6610`	`6612`	`longtounicode(Py_UNICODE buffer, size_t len, const char format, long x)`
`6611`	`6613`	`{`
	`6614`	`+ Py_ssize_t result;`
	`6615`	`+`
`6612`	`6616`	`PyOS_snprintf((char *)buffer, len, format, x);`
`6613`		`- return Py_SAFE_DOWNCAST(strtounicode(buffer, (char *)buffer),`
`6614`		`- Py_ssize_t, int);`
	`6617`	`+ result = strtounicode(buffer, (char *)buffer);`
	`6618`	`+ return Py_SAFE_DOWNCAST(result, Py_ssize_t, int);`
`6615`	`6619`	`}`
`6616`	`6620`
`6617`	`6621`	`/* XXX To save some code duplication, formatfloat/long/int could have been`