Fixed bugs #16995 and #19392

diff --git a/ext/session/session.c b/ext/session/session.c
index 45c415046a1570413aada352377ba44869c64035..d15e4e94b476659c7daa97d1b01c3b261ef4308a 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -570,6 +570,10 @@ static void php_session_save_current_state(TSRMLS_D)
                return;
        }
                
+       if (PS(http_session_vars) && PS(http_session_vars)->type!=IS_ARRAY) {
+               return;
+       }
+               
        if (PS(http_session_vars)) {
                for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(PS(http_session_vars)), &pos);
                                zend_hash_get_current_key_ex(Z_ARRVAL_P(PS(http_session_vars)), &variable, &variable_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING;