Fix leak in _PyCode_Update (#48)

iritkatriel · Jul 26, 2021 · 41cf743 · 41cf743
1 parent 2c31f5d
commit 41cf743
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
@@ -372,7 +372,7 @@ def _write_atomic(path, data, mode=0o666):
 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
 # in PC/launcher.c must also be updated.
 
-MAGIC_NUMBER = (9994).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (9996).to_bytes(2, 'little') + b'\r\n'
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c
 
 _PYCACHE = '__pycache__'

diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -324,6 +324,7 @@ init_code(PyCodeObject *co, struct _PyCodeConstructor *con)
     co->co_name = con->name;
     Py_INCREF(con->qualname);
     co->co_qualname = con->qualname;
+
     co->co_flags = con->flags;
 
     Py_XINCREF(con->code);
@@ -420,6 +421,10 @@ _PyCode_New(struct _PyCodeConstructor *con)
         PyErr_NoMemory();
         return NULL;
     }
+    co->co_filename = NULL;
+    co->co_name = NULL;
+    co->co_qualname = NULL;
+
     init_code(co, con);
 
     return co;
@@ -442,7 +447,11 @@ _PyCode_Update(struct _PyCodeConstructor *con, PyCodeObject *code)
         con->columntable = Py_None;
     }
 
-    init_code(code, con);  // TODO: This leaks!
+    Py_XDECREF(code->co_filename);
+    Py_XDECREF(code->co_name);
+    Py_XDECREF(code->co_qualname);
+
+    init_code(code, con);
 
     return code;
 }

diff --git a/Python/importlib_external.h b/Python/importlib_external.h