]> granicus.if.org Git - python/commitdiff
Issue #23914: Fixed SystemError raised by unpickler on broken pickle data.
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 23 Nov 2015 13:20:21 +0000 (15:20 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 23 Nov 2015 13:20:21 +0000 (15:20 +0200)
1  2 
Lib/test/pickletester.py
Misc/NEWS
Modules/_pickle.c

Simple merge
diff --cc Misc/NEWS
index 3297f4ee13afbbeea0c1b1eab06713ccbe860ccc,cdc891e8dddbaa91f3f05a7c22bbfeab8731f90a..fef1a32426fe748deb6425cf67034849eaf21107
+++ b/Misc/NEWS
@@@ -95,11 -107,6 +95,13 @@@ Core and Builtin
  Library
  -------
  
++- Issue #23914: Fixed SystemError raised by unpickler on broken pickle data.
++
 +- Issue #25691: Fixed crash on deleting ElementTree.Element attributes.
 +
 +- Issue #25624: ZipFile now always writes a ZIP_STORED header for directory
 +  entries.  Patch by Dingyuan Wang.
 +
  - Issue #25626: Change three zlib functions to accept sizes that fit in
    Py_ssize_t, but internally cap those sizes to UINT_MAX.  This resolves a
    regression in 3.5 where GzipFile.read() failed to read chunks larger than 2
Simple merge