mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 01:35:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-40330: Fix utf-8 size check in ShareableList (GH-19606)

Browse source 
The item size must be checked after encoding to bytes, not before.

Automerge-Triggered-By: @pitrou
This commit is contained in:
Antoine Pitrou 2020-04-20 20:54:55 +02:00 • committed by GitHub
parent 5dd21f5d1c
commit eba9f6155d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/multiprocessing/shared_memory.py
View file

@ -445,11 +445,14 @@ class ShareableList:
if not isinstance(value, (str, bytes)):
new_format = self._types_mapping[type(value)]
encoded_value = value
else:
allocated_length = self._allocated_offsets[position + 1] - item_offset
if len(value) > allocated_length:
raise ValueError("exceeds available storage for existing str")
encoded_value = (value.encode(_encoding)
if isinstance(value, str) else value)
if len(encoded_value) > allocated_length:
raise ValueError("bytes/str item exceeds available storage")
if current_format[-1] == "s":
new_format = current_format
else:
@ -462,8 +465,7 @@ class ShareableList:
new_format,
value
)
value = value.encode(_encoding) if isinstance(value, str) else value
struct.pack_into(new_format, self.shm.buf, offset, value)
struct.pack_into(new_format, self.shm.buf, offset, encoded_value)
def __reduce__(self):
return partial(self.__class__, name=self.shm.name), ()