Commit d7911aa9ea7 for php.net
commit d7911aa9ea7ad60698f224d02686aa525700f38b
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date: Wed Aug 5 10:33:58 2026 +0200
Improve merge
diff --git a/ext/session/session.c b/ext/session/session.c
index 257eec00239..5711f0daf21 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -459,10 +459,8 @@ static zend_result php_session_initialize(void)
} else if (PS(use_strict_mode) && PS(mod)->s_validate_sid &&
PS(mod)->s_validate_sid(&PS(mod_data), PS(id)) == FAILURE
) {
- if (PS(id)) {
- zend_string_release_ex(PS(id), false);
- PS(id) = NULL;
- }
+ zend_string_release_ex(PS(id), false);
+ PS(id) = NULL;
PS(id) = PS(mod)->s_create_sid(&PS(mod_data));
if (!PS(id)) {
PS(id) = php_session_create_id(NULL);