diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-08-11 19:15:53 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-08-11 19:15:53 (GMT) |
| commit | fdf4a274220d3167234792e91f29eb935c78e15d (patch) | |
| tree | d53b0ba4d92dc42397796625ff1e262caada3d14 | |
| parent | 49281076c1dcc3d8d7b5592a49dd9c65c1e6b8a4 (diff) | |
| parent | f6c7a8595ea77a2a470309127752432df2f6e872 (diff) | |
| download | cpython-fdf4a274220d3167234792e91f29eb935c78e15d.zip cpython-fdf4a274220d3167234792e91f29eb935c78e15d.tar.gz cpython-fdf4a274220d3167234792e91f29eb935c78e15d.tar.bz2 | |
Issue #12687: Fix a possible buffering bug when unpickling text mode (protocol 0, mostly) pickles.
| -rw-r--r-- | Lib/test/pickletester.py | 13 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_pickle.c | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index 45e8f74..f90d348 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -1438,6 +1438,19 @@ class AbstractPicklerUnpicklerObjectTests(unittest.TestCase): def test_multiple_unpicklings_unseekable(self): self._check_multiple_unpicklings(UnseekableIO) + def test_unpickling_buffering_readline(self): + # Issue #12687: the unpickler's buffering logic could fail with + # text mode opcodes. + data = list(range(10)) + for proto in protocols: + for buf_size in range(1, 11): + f = io.BufferedRandom(io.BytesIO(), buffer_size=buf_size) + pickler = self.pickler_class(f, protocol=proto) + pickler.dump(data) + f.seek(0) + unpickler = self.unpickler_class(f) + self.assertEqual(unpickler.load(), data) + if __name__ == "__main__": # Print some stuff that can be used to rewrite DATA{0,1,2} @@ -251,6 +251,9 @@ Core and Builtins Library ------- +- Issue #12687: Fix a possible buffering bug when unpickling text mode + (protocol 0, mostly) pickles. + - Issue #10087: Fix the html output format of the calendar module. - Issue #12540: Prevent zombie IDLE processes on Windows due to changes diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 06bce1e..f147e3e 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -1034,9 +1034,8 @@ _Unpickler_Readline(UnpicklerObject *self, char **result) num_read = _Unpickler_ReadFromFile(self, READ_WHOLE_LINE); if (num_read < 0) return -1; - *result = self->input_buffer; self->next_read_idx = num_read; - return num_read; + return _Unpickler_CopyLine(self, self->input_buffer, num_read, result); } /* If we get here, we've run off the end of the input string. Return the |