diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-02-24 20:34:38 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-02-24 20:34:38 (GMT) |
| commit | ec8f0df2296cfb88cd932eeb053edaa316600725 (patch) | |
| tree | 94137b33f9b53ce5a2034844d8aa6d26c8a48905 /Modules/_pickle.c | |
| parent | f4977d2f503fb8c2dd2376936683653f0d94c3e7 (diff) | |
| download | cpython-ec8f0df2296cfb88cd932eeb053edaa316600725.zip cpython-ec8f0df2296cfb88cd932eeb053edaa316600725.tar.gz cpython-ec8f0df2296cfb88cd932eeb053edaa316600725.tar.bz2 | |
Merged revisions 88546 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88546 | alexander.belopolsky | 2011-02-24 14:40:09 -0500 (Thu, 24 Feb 2011) | 3 lines
Issue #11286: Fixed unpickling of empty 2.x strings.
........
Diffstat (limited to 'Modules/_pickle.c')
| -rw-r--r-- | Modules/_pickle.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Modules/_pickle.c b/Modules/_pickle.c index b01a8b2..fb6281e 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -977,11 +977,6 @@ _Unpickler_Read(UnpicklerObject *self, char **s, Py_ssize_t n) { Py_ssize_t num_read; - if (n == 0) { - *s = NULL; - return 0; - } - if (self->next_read_idx + n <= self->input_len) { *s = self->input_buffer + self->next_read_idx; self->next_read_idx += n; |