gh-144069: Fix cleanup in _dbm deallocation

Author: VanshAgarwal24036

Lib/test/test_dbm.py

@@ -71,6 +71,11 @@ def test_error(self):
     def test_anydbm_not_existing(self):
         self.assertRaises(dbm.error, dbm.open, _fname)
 
+    def test_open_nonexistent_directory(self):
+        missing_dir = os.path.join(dirname + "_does_not_exist", "test.db")
+        with self.assertRaises(OSError):
+            dbm.open(missing_dir, "c")
+
     def test_anydbm_creation(self):
         f = dbm.open(_fname, 'c')
         self.assertEqual(list(f.keys()), [])
@@ -244,10 +249,6 @@ def setUp(self):
         self.addCleanup(cleaunup_test_dir)
         setup_test_dir()
 
-    def test_open_nonexistent_directory(self):
-        missing_dir = os.path.join(dirname + "_does_not_exist", "test.db")
-        with self.assertRaises(OSError):
-            dbm.open(missing_dir, "c")
 
 class WhichDBTestCase(unittest.TestCase):
     def test_whichdb(self):

Modules/_dbmmodule.c

@@ -91,10 +91,6 @@ newdbmobject(_dbm_state *state, const char *file, int flags, int mode)
     /* See issue #19296 */
     if ( (dp->di_dbm = dbm_open((char *)file, flags, mode)) == NULL ) {
         PyErr_SetFromErrnoWithFilename(state->dbm_error, file);
-        if (dp->di_dbm != NULL) {
-            dbm_close(dp->di_dbm);
-            dp->di_dbm = NULL;
-        }
         Py_DECREF(dp);
         return NULL;
     }
@@ -110,6 +106,7 @@ dbm_dealloc(PyObject *self)
     PyObject_GC_UnTrack(dp);
     if (dp->di_dbm) {
         dbm_close(dp->di_dbm);
+        dp->di_dbm = NULL;
     }
     PyTypeObject *tp = Py_TYPE(dp);
     tp->tp_free(dp);