]> granicus.if.org Git - php/commitdiff
protect http_session_vars from interrupt corruption
authorStanislav Malyshev <stas@php.net>
Fri, 4 Dec 2009 01:21:32 +0000 (01:21 +0000)
committerStanislav Malyshev <stas@php.net>
Fri, 4 Dec 2009 01:21:32 +0000 (01:21 +0000)
improve save_path check

ext/session/session.c

index c0d6691734b020b1e153abb4292f4b3b60fe627a..9e6bf525c569e8caff5e876d1fae78a6e71ef65d 100644 (file)
@@ -569,7 +569,7 @@ static PHP_INI_MH(OnUpdateSaveDir) /* {{{ */
                        p = new_value;
                }
 
-               if (php_check_open_basedir(p TSRMLS_CC)) {
+               if (*p && php_check_open_basedir(p TSRMLS_CC)) {
                        return FAILURE;
                }
        }
@@ -1817,7 +1817,10 @@ static PHP_FUNCTION(session_unset)
        }
 
        IF_SESSION_VARS() {
-               HashTable *ht = Z_ARRVAL_P(PS(http_session_vars));
+               HashTable *ht;
+
+               SEPARATE_ZVAL_IF_NOT_REF(&PS(http_session_vars));
+               ht = Z_ARRVAL_P(PS(http_session_vars));
 
                /* Clean $_SESSION. */
                zend_hash_clean(ht);