]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-140939: Fix memory leak in `_PyBytes_FormatEx` error path (#140957)
authorStan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>
Thu, 6 Nov 2025 05:50:57 +0000 (05:50 +0000)
committerGitHub <noreply@github.com>
Thu, 6 Nov 2025 05:50:57 +0000 (11:20 +0530)
Lib/test/test_bytes.py
Misc/NEWS.d/next/Core_and_Builtins/2025-11-03-17-21-38.gh-issue-140939.FVboAw.rst [new file with mode: 0644]
Objects/bytesobject.c

index f10e4041937f4f8c8e2e23d1f85602699d823af7..e012042159d22303df2dd98e334bb5f3646678ca 100644 (file)
@@ -802,6 +802,13 @@ class BaseBytesTest:
             with self.assertRaisesRegex(TypeError, msg):
                 operator.mod(format_bytes, value)
 
+    def test_memory_leak_gh_140939(self):
+        # gh-140939: MemoryError is raised without leaking
+        _testcapi = import_helper.import_module('_testcapi')
+        with self.assertRaises(MemoryError):
+            b = self.type2test(b'%*b')
+            b % (_testcapi.PY_SSIZE_T_MAX, b'abc')
+
     def test_imod(self):
         b = self.type2test(b'hello, %b!')
         orig = b
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-11-03-17-21-38.gh-issue-140939.FVboAw.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-11-03-17-21-38.gh-issue-140939.FVboAw.rst
new file mode 100644 (file)
index 0000000..a292176
--- /dev/null
@@ -0,0 +1,2 @@
+Fix memory leak when :class:`bytearray` or :class:`bytes` is formated with the
+``%*b`` format with a large width that results in a :exc:`MemoryError`.
index 9c807b3dd166eea5c9ede008d5b336bb135180a7..2b9513abe91956a95a7e2ef0985fc4fcb6ff650d 100644 (file)
@@ -985,6 +985,7 @@ _PyBytes_FormatEx(const char *format, Py_ssize_t format_len,
             if (alloc > 2) {
                 res = PyBytesWriter_GrowAndUpdatePointer(writer, alloc - 2, res);
                 if (res == NULL) {
+                    Py_XDECREF(temp);
                     goto error;
                 }
             }