Skip to content

Commit a3d76e1

Browse files
miss-islingtonlgeigervstinner
authored
[3.14] gh-150988: Fix refleak in OSError when attrs are set before super().__init__() (GH-150990) (#151241)
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 a9716b7 commit a3d76e1

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
@@ -1706,6 +1706,20 @@ def inner():
17061706
gc_collect() # For PyPy or other GCs.
17071707
self.assertEqual(wr(), None)
17081708

1709+
def test_oserror_reinit_leak(self):
1710+
# gh-150988: Check for memory leak when re-initializing OSError.
1711+
# Previously, setting OSError attributes in a subclass
1712+
# before calling super().__init__() leaked memory.
1713+
class LeakingOSError(OSError):
1714+
def __init__(self, code, message, filename, filename2):
1715+
self.strerror = message
1716+
self.filename = filename
1717+
self.filename2 = filename2
1718+
super().__init__(code, message, filename, None, filename2)
1719+
1720+
exc = LeakingOSError(1, "some message", "filename.py", "filename2.py")
1721+
exc.__init__(2, "another message", "filename3.py", "filename4.py")
1722+
17091723
def test_errno_ENOTDIR(self):
17101724
# Issue #12802: "not a directory" errors are ENOTDIR even on Windows
17111725
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
@@ -2074,10 +2074,10 @@ oserror_init(PyOSErrorObject *self, PyObject **p_args,
20742074
return -1;
20752075
}
20762076
else {
2077-
self->filename = Py_NewRef(filename);
2077+
Py_XSETREF(self->filename, Py_NewRef(filename));
20782078

20792079
if (filename2 && filename2 != Py_None) {
2080-
self->filename2 = Py_NewRef(filename2);
2080+
Py_XSETREF(self->filename2, Py_NewRef(filename2));
20812081
}
20822082

20832083
if (nargs >= 2 && nargs <= 5) {
@@ -2092,10 +2092,10 @@ oserror_init(PyOSErrorObject *self, PyObject **p_args,
20922092
}
20932093
}
20942094
}
2095-
self->myerrno = Py_XNewRef(myerrno);
2096-
self->strerror = Py_XNewRef(strerror);
2095+
Py_XSETREF(self->myerrno, Py_XNewRef(myerrno));
2096+
Py_XSETREF(self->strerror, Py_XNewRef(strerror));
20972097
#ifdef MS_WINDOWS
2098-
self->winerror = Py_XNewRef(winerror);
2098+
Py_XSETREF(self->winerror, Py_XNewRef(winerror));
20992099
#endif
21002100

21012101
/* Steals the reference to args */

0 commit comments

Comments
 (0)