SAPI: clear current_user and content_type_dup after releasing them

iliaal · iliaal · commit f8ff8f2acf49 · 2026-07-31T08:21:19.000-04:00
sapi_deactivate_module() frees both without resetting the pointer, unlike
the auth_user, auth_password and auth_digest fields next to them. Nothing
reads them between the free and the next sapi_activate() today, so this is
consistency rather than a live bug.
diff --git a/main/SAPI.c b/main/SAPI.c
@@ -521,9 +521,12 @@ SAPI_API void sapi_deactivate_module(void)
 	}
 	if (SG(request_info).content_type_dup) {
 		efree(SG(request_info).content_type_dup);
+		SG(request_info).content_type_dup = NULL;
 	}
 	if (SG(request_info).current_user) {
 		efree(SG(request_info).current_user);
+		SG(request_info).current_user = NULL;
+		SG(request_info).current_user_length = 0;
 	}
 	if (sapi_module.deactivate) {
 		sapi_module.deactivate();

Original file line number	Diff line number	Diff line change
`@@ -521,9 +521,12 @@ SAPI_API void sapi_deactivate_module(void)`
`521`	`521`	`}`
`522`	`522`	`if (SG(request_info).content_type_dup) {`
`523`	`523`	`efree(SG(request_info).content_type_dup);`
	`524`	`+ SG(request_info).content_type_dup = NULL;`
`524`	`525`	`}`
`525`	`526`	`if (SG(request_info).current_user) {`
`526`	`527`	`efree(SG(request_info).current_user);`
	`528`	`+ SG(request_info).current_user = NULL;`
	`529`	`+ SG(request_info).current_user_length = 0;`
`527`	`530`	`}`
`528`	`531`	`if (sapi_module.deactivate) {`
`529`	`532`	`sapi_module.deactivate();`