mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

use Py_CHARMASK; and don't check for neg. float to the float power here

Browse source
This commit is contained in:
Guido van Rossum 1995-02-10 17:00:37 +00:00
parent 2497eada60
commit 9fa2c11613
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/stringobject.c
View file

@ -749,10 +749,10 @@ formatstring(format, args)
if (--fmtcnt >= 0)
c = *fmt++;
}
else if (isdigit(c)) {
else if (c >= 0 && isdigit(c)) {
width = c - '0';
while (--fmtcnt >= 0) {
c = *fmt++;
c = Py_CHARMASK(*fmt++);
if (!isdigit(c))
break;
if ((width*10) / 10 != width) {
@ -782,10 +782,10 @@ formatstring(format, args)
if (--fmtcnt >= 0)
c = *fmt++;
}
else if (isdigit(c)) {
else if (c >= 0 && isdigit(c)) {
prec = c - '0';
while (--fmtcnt >= 0) {
c = *fmt++;
c = Py_CHARMASK(*fmt++);
if (!isdigit(c))
break;
if ((prec*10) / 10 != prec) {
@ -913,7 +913,7 @@ formatstring(format, args)
--rescnt;
*res++ = ' ';
}
if (dict && (argidx < arglen)) {
if (dict && (argidx < arglen) && c != '%') {
err_setstr(TypeError,
"not all arguments converted");
goto error;