mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge 3.4 (#23369)

Browse source
This commit is contained in:
Benjamin Peterson 2015-02-01 18:00:19 -05:00
commit 71cf91cc09
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Modules/_json.c
View file

@ -182,17 +182,24 @@ ascii_escape_unicode(PyObject *pystr)
/* Compute the output size */
for (i = 0, output_size = 2; i < input_chars; i++) {
Py_UCS4 c = PyUnicode_READ(kind, input, i);
if (S_CHAR(c))
output_size++;
Py_ssize_t d;
if (S_CHAR(c)) {
d = 1;
}
else {
switch(c) {
case '\\': case '"': case '\b': case '\f':
case '\n': case '\r': case '\t':
output_size += 2; break;
d = 2; break;
default:
output_size += c >= 0x10000 ? 12 : 6;
d = c >= 0x10000 ? 12 : 6;
}
}
if (output_size > PY_SSIZE_T_MAX - d) {
PyErr_SetString(PyExc_OverflowError, "string is too long to escape");
return NULL;
}
output_size += d;
}
rval = PyUnicode_New(output_size, 127);