mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-10 02:36:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-29568: Disable any characters between two percents for escaped percent "%%" in the format string for classic string formatting. (GH-513)

Browse source
This commit is contained in:
Serhiy Storchaka 2017-03-08 05:51:19 +02:00 • committed by Xiang Zhang
parent c393ee8589
commit 9f8ad3f39e
4 changed files with 57 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Objects/unicodeobject.c
View file

@ -14617,12 +14617,6 @@ unicode_format_arg_format(struct unicode_formatter_t *ctx,
if (ctx->fmtcnt == 0)
ctx->writer.overallocate = 0;
if (arg->ch == '%') {
if (_PyUnicodeWriter_WriteCharInline(writer, '%') < 0)
return -1;
return 1;
}
v = unicode_format_getnextarg(ctx);
if (v == NULL)
return -1;
@ -14882,6 +14876,13 @@ unicode_format_arg(struct unicode_formatter_t *ctx)
int ret;
arg.ch = PyUnicode_READ(ctx->fmtkind, ctx->fmtdata, ctx->fmtpos);
if (arg.ch == '%') {
ctx->fmtpos++;
ctx->fmtcnt--;
if (_PyUnicodeWriter_WriteCharInline(&ctx->writer, '%') < 0)
return -1;
return 0;
}
arg.flags = 0;
arg.width = -1;
arg.prec = -1;
@ -14903,7 +14904,7 @@ unicode_format_arg(struct unicode_formatter_t *ctx)
return -1;
}
if (ctx->dict && (ctx->argidx < ctx->arglen) && arg.ch != '%') {
if (ctx->dict && (ctx->argidx < ctx->arglen)) {
PyErr_SetString(PyExc_TypeError,
"not all arguments converted during string formatting");
return -1;