gh-150988: Fix refleak in OSError when attrs are set before __init__

Author: lgeiger

Lib/test/test_exceptions.py

@@ -1714,6 +1714,33 @@ def inner():
         gc_collect()  # For PyPy or other GCs.
         self.assertEqual(wr(), None)
 
+    def test_oserror_reinit_leak(self):
+        msg = "some error message"
+        filename = "some filename"
+        filename2 = "some filename 2"
+    
+        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)
+    
+        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)
+
     def test_errno_ENOTDIR(self):
         # Issue #12802: "not a directory" errors are ENOTDIR even on Windows
         with self.assertRaises(OSError) as cm:

Objects/exceptions.c

@@ -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) {
@@ -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 */