summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Skeleton (bot) <31488909+miss-islington@users.noreply.github.com>2020-11-03 21:32:59 (GMT)
committerGitHub <noreply@github.com>2020-11-03 21:32:59 (GMT)
commit9bc07874e34930d4e816a9a3330aab009404991e (patch)
treef1a9ed8f60cb4dad98b2f2e0028f1427a0f019c9
parent6b7a90db362253d67201c2a438a3f38f1ec6180c (diff)
downloadcpython-9bc07874e34930d4e816a9a3330aab009404991e.zip
cpython-9bc07874e34930d4e816a9a3330aab009404991e.tar.gz
cpython-9bc07874e34930d4e816a9a3330aab009404991e.tar.bz2
bpo-42249: Fix writing binary Plist files larger than 4 GiB. (GH-23121)
(cherry picked from commit 212d32f45c91849c17a82750df1ac498d63976be) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
-rw-r--r--Lib/plistlib.py2
-rw-r--r--Misc/NEWS.d/next/Library/2020-11-03-09-22-56.bpo-42249.vfNO2u.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/plistlib.py b/Lib/plistlib.py
index 83b214e..2eeebe4 100644
--- a/Lib/plistlib.py
+++ b/Lib/plistlib.py
@@ -611,7 +611,7 @@ def _count_to_size(count):
elif count < 1 << 16:
return 2
- elif count << 1 << 32:
+ elif count < 1 << 32:
return 4
else:
diff --git a/Misc/NEWS.d/next/Library/2020-11-03-09-22-56.bpo-42249.vfNO2u.rst b/Misc/NEWS.d/next/Library/2020-11-03-09-22-56.bpo-42249.vfNO2u.rst
new file mode 100644
index 0000000..071a0fd
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-11-03-09-22-56.bpo-42249.vfNO2u.rst
@@ -0,0 +1 @@
+Fixed writing binary Plist files larger than 4 GiB.