Skip to content

Commit 7201b9d

Browse files
miss-islingtonlgeigervstinner
authored
[3.15] gh-150988: Fix refleak in OSError when attrs are set before super().__init__() (GH-150990) (#151240)
gh-150988: Fix refleak in `OSError` when attrs are set before `super().__init__()` (GH-150990) (cherry picked from commit f2a0f82) Co-authored-by: Lukas Geiger <lukas.geiger94@gmail.com> Co-authored-by: Victor Stinner <vstinner@python.org>
1 parent 153607e commit 7201b9d

3 files changed

Lines changed: 21 additions & 5 deletions

File tree

Lib/test/test_exceptions.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1714,6 +1714,20 @@ def inner():
17141714
gc_collect() # For PyPy or other GCs.
17151715
self.assertEqual(wr(), None)
17161716

1717+
def test_oserror_reinit_leak(self):
1718+
# gh-150988: Check for memory leak when re-initializing OSError.
1719+
# Previously, setting OSError attributes in a subclass
1720+
# before calling super().__init__() leaked memory.
1721+
class LeakingOSError(OSError):
1722+
def __init__(self, code, message, filename, filename2):
1723+
self.strerror = message
1724+
self.filename = filename
1725+
self.filename2 = filename2
1726+
super().__init__(code, message, filename, None, filename2)
1727+
1728+
exc = LeakingOSError(1, "some message", "filename.py", "filename2.py")
1729+
exc.__init__(2, "another message", "filename3.py", "filename4.py")
1730+
17171731
def test_errno_ENOTDIR(self):
17181732
# Issue #12802: "not a directory" errors are ENOTDIR even on Windows
17191733
with self.assertRaises(OSError) as cm:
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix a reference leak in :exc:`OSError` when attributes are set before
2+
``super().__init__()``.

Objects/exceptions.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2140,10 +2140,10 @@ oserror_init(PyOSErrorObject *self, PyObject **p_args,
21402140
return -1;
21412141
}
21422142
else {
2143-
self->filename = Py_NewRef(filename);
2143+
Py_XSETREF(self->filename, Py_NewRef(filename));
21442144

21452145
if (filename2 && filename2 != Py_None) {
2146-
self->filename2 = Py_NewRef(filename2);
2146+
Py_XSETREF(self->filename2, Py_NewRef(filename2));
21472147
}
21482148

21492149
if (nargs >= 2 && nargs <= 5) {
@@ -2158,10 +2158,10 @@ oserror_init(PyOSErrorObject *self, PyObject **p_args,
21582158
}
21592159
}
21602160
}
2161-
self->myerrno = Py_XNewRef(myerrno);
2162-
self->strerror = Py_XNewRef(strerror);
2161+
Py_XSETREF(self->myerrno, Py_XNewRef(myerrno));
2162+
Py_XSETREF(self->strerror, Py_XNewRef(strerror));
21632163
#ifdef MS_WINDOWS
2164-
self->winerror = Py_XNewRef(winerror);
2164+
Py_XSETREF(self->winerror, Py_XNewRef(winerror));
21652165
#endif
21662166

21672167
/* Steals the reference to args */

0 commit comments

Comments
 (0)