Fixed bugs #18167 & #16859

diff --git a/ext/session/session.c b/ext/session/session.c
index 453803603e5c61ef0fbfb40b56a2cda115129b8f..52c8c8494252853cac9bd3c2df99d159cfe93ca8 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -266,7 +266,7 @@ void php_set_session_var(char *name, size_t namelen, zval *state_val, php_unseri
                } else {
                        zend_set_hash_symbol(state_val, name, namelen, 1, 2, Z_ARRVAL_P(PS(http_session_vars)), &EG(symbol_table));
                }
-       } else {
+       } else if (PS(http_session_vars)) {
                zend_set_hash_symbol(state_val, name, namelen, 0, 1, Z_ARRVAL_P(PS(http_session_vars)));
        }
 }