]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-149931: Fix memory leaks on failed realloc (#149932)
authorAN Long <aisk@users.noreply.github.com>
Tue, 26 May 2026 00:37:14 +0000 (09:37 +0900)
committerGitHub <noreply@github.com>
Tue, 26 May 2026 00:37:14 +0000 (01:37 +0100)
Modules/_remote_debugging/frames.c
Modules/timemodule.c

index 8d8019396b3e31abbf8929972101adc2b073324f..d73cd080dc477f3adbf32a084bcd5df471b4b347 100644 (file)
@@ -56,12 +56,14 @@ process_single_stack_chunk(
             return -1;
         }
 
-        this_chunk = PyMem_RawRealloc(this_chunk, actual_size);
-        if (!this_chunk) {
+        char *tmp = PyMem_RawRealloc(this_chunk, actual_size);
+        if (!tmp) {
+            PyMem_RawFree(this_chunk);
             PyErr_NoMemory();
             set_exception_cause(unwinder, PyExc_MemoryError, "Failed to reallocate stack chunk buffer");
             return -1;
         }
+        this_chunk = tmp;
 
         if (_Py_RemoteDebug_PagedReadRemoteMemory(&unwinder->handle, chunk_addr, actual_size, this_chunk) < 0) {
             PyMem_RawFree(this_chunk);
index 25e744d7da25c72500931c4e90e5e5825207ca72..d90bf1f2ef90ed97020d04f183e9e8cb6c800404 100644 (file)
@@ -820,12 +820,15 @@ time_strftime1(time_char **outbuf, size_t *bufsize,
             PyErr_NoMemory();
             return NULL;
         }
-        *outbuf = (time_char *)PyMem_Realloc(*outbuf,
-                                             *bufsize*sizeof(time_char));
-        if (*outbuf == NULL) {
+        time_char *tmp = (time_char *)PyMem_Realloc(*outbuf,
+                                                    *bufsize*sizeof(time_char));
+        if (tmp == NULL) {
+            PyMem_Free(*outbuf);
+            *outbuf = NULL;
             PyErr_NoMemory();
             return NULL;
         }
+        *outbuf = tmp;
 #if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__)
         errno = 0;
 #endif