Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions Lib/test/test_exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -1714,6 +1714,48 @@ def inner():
gc_collect() # For PyPy or other GCs.
self.assertEqual(wr(), None)

@cpython_only
def test_oserror_refleak_attributes_before_init(self):
# gh-150988: no leak when a subclass sets OSError fields before
# super().__init__(), or when __init__ is called more than once.
class LeakingOSError(OSError):
def __init__(self, code, message, filename, filename2):
self.strerror = message
self.filename = filename
self.filename2 = filename2
super().__init__(code, message, filename, None, filename2)

msg = "some error message"
filename = "some filename"
filename2 = "some filename 2"
refcount_msg = sys.getrefcount(msg)
refcount_filename = sys.getrefcount(filename)
refcount_filename2 = sys.getrefcount(filename2)

for _ in range(5):
try:
raise LeakingOSError(1, msg, filename, filename2)
except OSError:
pass

gc_collect()
self.assertEqual(sys.getrefcount(msg), refcount_msg)
self.assertEqual(sys.getrefcount(filename), refcount_filename)
self.assertEqual(sys.getrefcount(filename2), refcount_filename2)

exc = LeakingOSError(1, msg, filename, filename2)
exc.__init__(2, msg, filename, filename2)
self.assertEqual(exc.errno, 2)
self.assertEqual(exc.strerror, msg)
self.assertEqual(exc.filename, filename)
self.assertEqual(exc.filename2, filename2)
del exc

gc_collect()
self.assertEqual(sys.getrefcount(msg), refcount_msg)
self.assertEqual(sys.getrefcount(filename), refcount_filename)
self.assertEqual(sys.getrefcount(filename2), refcount_filename2)

def test_errno_ENOTDIR(self):
# Issue #12802: "not a directory" errors are ENOTDIR even on Windows
with self.assertRaises(OSError) as cm:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a reference leak in :exc:`OSError` when attributes are set before
``super().__init__()`` or when :meth:`~object.__init__` runs more than once.
10 changes: 5 additions & 5 deletions Objects/exceptions.c
Original file line number Diff line number Diff line change
Expand Up @@ -2140,10 +2140,10 @@ oserror_init(PyOSErrorObject *self, PyObject **p_args,
return -1;
}
else {
self->filename = Py_NewRef(filename);
Py_XSETREF(self->filename, Py_NewRef(filename));

if (filename2 && filename2 != Py_None) {
self->filename2 = Py_NewRef(filename2);
Py_XSETREF(self->filename2, Py_NewRef(filename2));
}

if (nargs >= 2 && nargs <= 5) {
Expand All @@ -2158,10 +2158,10 @@ oserror_init(PyOSErrorObject *self, PyObject **p_args,
}
}
}
self->myerrno = Py_XNewRef(myerrno);
self->strerror = Py_XNewRef(strerror);
Py_XSETREF(self->myerrno, Py_XNewRef(myerrno));
Py_XSETREF(self->strerror, Py_XNewRef(strerror));
#ifdef MS_WINDOWS
self->winerror = Py_XNewRef(winerror);
Py_XSETREF(self->winerror, Py_XNewRef(winerror));
#endif

/* Steals the reference to args */
Expand Down
Loading