mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Issue #17710: Fix pickle raising a SystemError on bogus input.

Browse source
This commit is contained in:
Antoine Pitrou 2013-04-15 21:55:14 +02:00
commit af94051a93
4 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/_pickle.c
View file

@ -4205,7 +4205,7 @@ load_string(UnpicklerObject *self)
if ((len = _Unpickler_Readline(self, &s)) < 0)
return -1;
if (len < 3)
if (len < 2)
return bad_readline();
if ((s = strdup(s)) == NULL) {
PyErr_NoMemory();
@ -4213,14 +4213,14 @@ load_string(UnpicklerObject *self)
}
/* Strip outermost quotes */
while (s[len - 1] <= ' ')
while (len > 0 && s[len - 1] <= ' ')
len--;
if (s[0] == '"' && s[len - 1] == '"') {
if (len > 1 && s[0] == '"' && s[len - 1] == '"') {
s[len - 1] = '\0';
p = s + 1;
len -= 2;
}
else if (s[0] == '\'' && s[len - 1] == '\'') {
else if (len > 1 && s[0] == '\'' && s[len - 1] == '\'') {
s[len - 1] = '\0';
p = s + 1;
len -= 2;