[PHP-CVS] [php-src] master: Improve merge

Author: ndossche (ndossche)
Date: 2026-08-05T10:33:58+02:00

Commit: https://github.com/php/php-src/commit/d7911aa9ea7ad60698f224d02686aa525700f38b
Raw diff: https://github.com/php/php-src/commit/d7911aa9ea7ad60698f224d02686aa525700f38b.diff

Improve merge

Changed paths:
  M  ext/session/session.c


Diff:

diff --git a/ext/session/session.c b/ext/session/session.c
index 257eec002392..5711f0daf216 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);