diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-08-30 19:42:22 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-30 19:42:22 (GMT) |
commit | ca55ecbf9aab305fa301ec69410ca3d3d18ec848 (patch) | |
tree | 87a95832befa4610738be966fa3340e6b12ac57a | |
parent | 901c2eae6e27ee7793e5a3c638664e01a3bf8de8 (diff) | |
download | cpython-ca55ecbf9aab305fa301ec69410ca3d3d18ec848.zip cpython-ca55ecbf9aab305fa301ec69410ca3d3d18ec848.tar.gz cpython-ca55ecbf9aab305fa301ec69410ca3d3d18ec848.tar.bz2 |
bpo-41344: Raise ValueError when creating shared memory of size 0 (GH-21556) (GH-22018)
(cherry picked from commit 475a5fbb5644ea200c990d85d8c264e78ab6c7ea)
Co-authored-by: Vinay Sharma <vinay04sharma@icloud.com>
Co-authored-by: Vinay Sharma <vinay04sharma@icloud.com>
-rw-r--r-- | Lib/multiprocessing/shared_memory.py | 2 | ||||
-rw-r--r-- | Lib/test/_test_multiprocessing.py | 12 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Library/2020-07-20-13-27-48.bpo-41344.iKipNd.rst | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/Lib/multiprocessing/shared_memory.py b/Lib/multiprocessing/shared_memory.py index a3a5fcf..122b3fc 100644 --- a/Lib/multiprocessing/shared_memory.py +++ b/Lib/multiprocessing/shared_memory.py @@ -76,6 +76,8 @@ class SharedMemory: raise ValueError("'size' must be a positive integer") if create: self._flags = _O_CREX | os.O_RDWR + if size == 0: + raise ValueError("'size' must be a positive number different from zero") if name is None and not self._flags & os.O_EXCL: raise ValueError("'name' can only be None if create=True") diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index c783fc2..e47905c 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -3864,6 +3864,18 @@ class _TestSharedMemory(BaseTestCase): sms.close() + # Test creating a shared memory segment with negative size + with self.assertRaises(ValueError): + sms_invalid = shared_memory.SharedMemory(create=True, size=-1) + + # Test creating a shared memory segment with size 0 + with self.assertRaises(ValueError): + sms_invalid = shared_memory.SharedMemory(create=True, size=0) + + # Test creating a shared memory segment without size argument + with self.assertRaises(ValueError): + sms_invalid = shared_memory.SharedMemory(create=True) + def test_shared_memory_across_processes(self): # bpo-40135: don't define shared memory block's name in case of # the failure when we run multiprocessing tests in parallel. diff --git a/Misc/NEWS.d/next/Library/2020-07-20-13-27-48.bpo-41344.iKipNd.rst b/Misc/NEWS.d/next/Library/2020-07-20-13-27-48.bpo-41344.iKipNd.rst new file mode 100644 index 0000000..475bc9b --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-07-20-13-27-48.bpo-41344.iKipNd.rst @@ -0,0 +1 @@ +Prevent creating :class:`shared_memory.SharedMemory` objects with :code:`size=0`. |