gh-125234: Make PyInitConfig_Free(NULL) a no-op (#125266)

rruuaanng · web-flow · commit 546dddca43a2 · 2024-10-15T09:21:16.000Z
diff --git a/Doc/c-api/init_config.rst b/Doc/c-api/init_config.rst
@@ -1621,6 +1621,8 @@ Create Config
 
    Free memory of the initialization configuration *config*.
 
+   If *config* is ``NULL``, no operation is performed.
+
 
 Error Handling
 --------------
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
@@ -1896,6 +1896,7 @@ static int test_initconfig_api(void)
         goto error;
     }
     PyInitConfig_Free(config);
+    PyInitConfig_Free(NULL);
 
     dump_config();
     Py_Finalize();
diff --git a/Python/initconfig.c b/Python/initconfig.c
@@ -3457,6 +3457,9 @@ PyInitConfig_Create(void)
 void
 PyInitConfig_Free(PyInitConfig *config)
 {
+    if (config == NULL) {
+        return;
+    }
     free(config->err_msg);
     free(config);
 }

Original file line number	Diff line number	Diff line change
`@@ -1896,6 +1896,7 @@ static int test_initconfig_api(void)`
`1896`	`1896`	`goto error;`
`1897`	`1897`	`}`
`1898`	`1898`	`PyInitConfig_Free(config);`
	`1899`	`+ PyInitConfig_Free(NULL);`
`1899`	`1900`
`1900`	`1901`	`dump_config();`
`1901`	`1902`	`Py_Finalize();`
Original file line number	Diff line number	Diff line change
`@@ -3457,6 +3457,9 @@ PyInitConfig_Create(void)`
`3457`	`3457`	`void`
`3458`	`3458`	`PyInitConfig_Free(PyInitConfig *config)`
`3459`	`3459`	`{`
	`3460`	`+ if (config == NULL) {`
	`3461`	`+ return;`
	`3462`	`+ }`
`3460`	`3463`	`free(config->err_msg);`
`3461`	`3464`	`free(config);`
`3462`	`3465`	`}`