Fix bug #15322 and fix a little memory leak

diff --git a/ext/session/session.c b/ext/session/session.c
index 9141957a1796d35c733607a57b646081d08065d0..97e9a9ca64057bd6c6a53b1a292ddd3eed025ccc 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -479,19 +479,25 @@ static char *php_session_encode(int *newlen TSRMLS_DC)
 {
        char *ret = NULL;
 
-       if (PS(serializer)->encode(&ret, newlen TSRMLS_CC) == FAILURE)
+       if (PS(serializer)->encode(&ret, newlen TSRMLS_CC) == FAILURE) {
                ret = NULL;
-
+       }
+       
        return ret;
 }
 
-static void php_session_decode(const char *val, int vallen TSRMLS_DC)
+static int php_session_decode(const char *val, int vallen TSRMLS_DC)
 {
-       php_session_track_init(TSRMLS_C);
-       if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) {
-               php_session_destroy(TSRMLS_C);
-               php_error(E_WARNING, "Failed to decode session object. Session has been destroyed.");
+       if (PS(session_status) == php_session_active) {
+               php_session_track_init(TSRMLS_C);
+               if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) {
+                       php_session_destroy(TSRMLS_C);
+                       php_error(E_WARNING, "Failed to decode session object. Session has been destroyed.");
+                       return FAILURE;
+               }
+               return SUCCESS;
        }
+       return FAILURE;
 }
 
 static char hexconvtab[] = "0123456789abcdef";
@@ -836,10 +842,11 @@ PHPAPI void php_session_start(TSRMLS_D)
        int module_number = PS(module_number);
        int nrand;
        int lensess;
+       smart_str var = {0};
 
        PS(apply_trans_sid) = PS(use_trans_sid);
 
-       if (PS(session_status) != php_session_none) 
+       if (PS(session_status) != php_session_none)
                return;
 
        lensess = strlen(PS(session_name));
@@ -929,30 +936,23 @@ PHPAPI void php_session_start(TSRMLS_D)
                php_session_send_cookie(TSRMLS_C);
        }
 
-
+       smart_str_appends(&var, PS(session_name));
+       smart_str_appendc(&var, '=');
+       smart_str_appends(&var, PS(id));
+       smart_str_0(&var);
+       REGISTER_STRING_CONSTANT("SID", var.c, 0);
        if (PS(apply_trans_sid)) {
-               smart_str var = {0};
-
-               smart_str_appends(&var, PS(session_name));
-               smart_str_appendc(&var, '=');
-               smart_str_appends(&var, PS(id));
-               smart_str_0(&var);
-               REGISTER_STRING_CONSTANT("SID", var.c, 0);
-       } else {
-               REGISTER_STRING_CONSTANT("SID", empty_string, 0);
+               php_session_start_output_handler(4096 TSRMLS_CC);
        }
 
        PS(session_status) = php_session_active;
-       if (PS(apply_trans_sid)) {
-               php_session_start_output_handler(4096 TSRMLS_CC);
-       }
 
        php_session_cache_limiter(TSRMLS_C);
        php_session_initialize(TSRMLS_C);
 
-       if (PS(mod_data) && PS(gc_probability) > 0) {
+       if (PS(mod_data)  && PS(gc_probability) > 0) {
                int nrdels = -1;
-
+               
                nrand = (int) (100.0*php_combined_lcg(TSRMLS_C));
                if (nrand < PS(gc_probability)) {
                        PS(mod)->gc(&PS(mod_data), PS(gc_maxlifetime), &nrdels);
@@ -964,18 +964,20 @@ PHPAPI void php_session_start(TSRMLS_D)
        }
 }
 
+
 static zend_bool php_session_destroy(TSRMLS_D)
 {
        zend_bool retval = SUCCESS;
 
        if (PS(session_status) != php_session_active) {
-               php_error(E_WARNING, "Trying to destroy uninitialized session");
+               php_error(E_NOTICE, "Trying to destroy uninitialized session");
                return FAILURE;
        }
 
-       if (PS(mod)->destroy(&PS(mod_data), PS(id)) == FAILURE) {
+       if (PS(mod)->destroy(&PS(mod_data), PS(id) TSRMLS_CC) == FAILURE) {
+               PS(session_status) = php_session_disabled;              
                retval = FAILURE;
-               php_error(E_WARNING, "Session object destruction failed");
+               php_error(E_NOTICE, "Session object destruction failed");
        }
        
        php_rshutdown_session_globals(TSRMLS_C);
@@ -991,20 +993,24 @@ PHP_FUNCTION(session_set_cookie_params)
 {
     zval **lifetime, **path, **domain, **secure;
 
-       if (!PS(use_cookies))
-               return;
 
     if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 4 ||
                zend_get_parameters_ex(ZEND_NUM_ARGS(), &lifetime, &path, &domain, &secure) == FAILURE)
                WRONG_PARAM_COUNT;
 
+       if (!PS(use_cookies)) {
+               php_error(E_NOTICE, "%s() cannot set cookie parameter when use_cookies is off",
+                                 get_active_function_name(TSRMLS_C));
+               RETURN_FALSE;
+       }
+
        convert_to_long_ex(lifetime);
        PS(cookie_lifetime) = Z_LVAL_PP(lifetime);
 
        if (ZEND_NUM_ARGS() > 1) {
                convert_to_string_ex(path);
                zend_alter_ini_entry("session.cookie_path", sizeof("session.cookie_path"), Z_STRVAL_PP(path), Z_STRLEN_PP(path), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
-
+               
                if (ZEND_NUM_ARGS() > 2) {
                        convert_to_string_ex(domain);
                        zend_alter_ini_entry("session.cookie_domain", sizeof("session.cookie_domain"), Z_STRVAL_PP(domain), Z_STRLEN_PP(domain), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
@@ -1129,18 +1135,22 @@ PHP_FUNCTION(session_save_path)
 {
        zval **p_name;
        int ac = ZEND_NUM_ARGS();
-       char *old;
-
-       old = estrdup(PS(save_path));
+       char *old = NULL;
 
        if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
                WRONG_PARAM_COUNT;
-
+       
        if (ac == 1) {
+               if (PS(session_status) == php_session_active) {
+                       php_error(E_NOTICE, "%s() cannot change session save path  once session is started.",
+                                         get_active_function_name(TSRMLS_C));
+                       RETURN_FALSE;
+               }
                convert_to_string_ex(p_name);
                zend_alter_ini_entry("session.save_path", sizeof("session.save_path"), Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
        }
-       
+
+       old = estrdup(PS(save_path));
        RETVAL_STRING(old, 0);
 }
 /* }}} */
@@ -1153,18 +1163,21 @@ PHP_FUNCTION(session_id)
        int ac = ZEND_NUM_ARGS();
        char *old = empty_string;
 
-       if (PS(id))
-               old = estrdup(PS(id));
-
        if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
                WRONG_PARAM_COUNT;
-
+       
        if (ac == 1) {
-               convert_to_string_ex(p_name);
                if (PS(id)) efree(PS(id));
+               if (PS(session_status) == php_session_active) {
+                       php_error(E_NOTICE, "%s() cannot set session id once session is started.",
+                                         get_active_function_name(TSRMLS_C));
+                       RETURN_FALSE;
+               }
+               convert_to_string_ex(p_name);
                PS(id) = estrndup(Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name));
        }
-       
+
+       old = safe_estrdup(PS(id));
        RETVAL_STRING(old, 0);
 }
 /* }}} */
@@ -1175,18 +1188,23 @@ PHP_FUNCTION(session_cache_limiter)
 {
        zval **p_cache_limiter;
        int ac = ZEND_NUM_ARGS();
-       char *old;
-
-       old = estrdup(PS(cache_limiter));
+       char *old = NULL;
 
        if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_cache_limiter) == FAILURE)
                WRONG_PARAM_COUNT;
 
        if (ac == 1) {
+               if (PS(session_status) == php_session_active) {
+                       php_error(E_NOTICE, "%s() cannot set session module name once session is started.",
+                                         get_active_function_name(TSRMLS_C));
+                       RETURN_FALSE;
+               }
+               
                convert_to_string_ex(p_cache_limiter);
                zend_alter_ini_entry("session.cache_limiter", sizeof("session.cache_limiter"), Z_STRVAL_PP(p_cache_limiter), Z_STRLEN_PP(p_cache_limiter), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
        }
-       
+
+       old = estrdup(PS(cache_limiter));
        RETVAL_STRING(old, 0);
 }
 /* }}} */
@@ -1197,9 +1215,7 @@ PHP_FUNCTION(session_cache_expire)
 {
        zval **p_cache_expire;
        int ac = ZEND_NUM_ARGS();
-       long old;
-
-       old = PS(cache_expire);
+       long old = PS(cache_expire);
 
        if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_cache_expire) == FAILURE)
                WRONG_PARAM_COUNT;
@@ -1244,6 +1260,11 @@ PHP_FUNCTION(session_register)
        int      argc = ZEND_NUM_ARGS();
        int      i;
 
+       if (!PG(register_globals)) {
+               php_error(E_NOTICE, "Use %s() only for globals. Use $_SESSION, instead.",
+                                 get_active_function_name(TSRMLS_C));
+       }
+       
        if (argc <= 0)
                RETURN_FALSE
        else
@@ -1276,9 +1297,20 @@ PHP_FUNCTION(session_unregister)
        zval **p_name;
        int ac = ZEND_NUM_ARGS();
 
+       if (!PG(register_globals)) {
+               php_error(E_NOTICE, "Use %s() only for globals. Use $_SESSION, instead.",
+                                 get_active_function_name(TSRMLS_C));
+       }
+
        if (ac != 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
                WRONG_PARAM_COUNT;
-       
+
+       if (PS(session_status) == php_session_active) {
+               php_error(E_NOTICE, "%s() cannot be used unless session is started.",
+                                 get_active_function_name(TSRMLS_C));
+               RETURN_FALSE;
+       }
+               
        convert_to_string_ex(p_name);
        
        PS_DEL_VARL(Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name));
@@ -1295,9 +1327,20 @@ PHP_FUNCTION(session_is_registered)
        zval *p_var;
        int ac = ZEND_NUM_ARGS();
 
+       if (!PG(register_globals)) {
+               php_error(E_NOTICE, "Use %s() only for globals. Use $_SESSION, instead.",
+                                 get_active_function_name(TSRMLS_C));
+       }
+
        if (ac != 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
                WRONG_PARAM_COUNT;
        
+       if (PS(session_status) == php_session_active) {
+               php_error(E_NOTICE, "%s() cannot be used unless session is started.",
+                                 get_active_function_name(TSRMLS_C));
+               RETURN_FALSE;
+       }
+
        convert_to_string_ex(p_name);
        
        if (zend_hash_find(&PS(vars), Z_STRVAL_PP(p_name), 
@@ -1329,13 +1372,15 @@ PHP_FUNCTION(session_encode)
 PHP_FUNCTION(session_decode)
 {
        zval **str;
+       int ret;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE)
                WRONG_PARAM_COUNT;
 
        convert_to_string_ex(str);
 
-       php_session_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str) TSRMLS_CC);
+       ret = php_session_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str) TSRMLS_CC);
+       RETURN_BOOL(ret == SUCCESS ? 1 : 0);
 }
 /* }}} */
 
@@ -1343,7 +1388,11 @@ PHP_FUNCTION(session_decode)
    Begin session - reinitializes freezed variables, registers browsers etc */
 PHP_FUNCTION(session_start)
 {
-       /* skipping check for non-zero args for performance reasons here ?*/
+       if (ZEND_NUM_ARGS() != 0) {
+               WRONG_PARAM_COUNT;
+       }
+
+       /* Session start may fail. Better to return status */
        php_session_start(TSRMLS_C);
        RETURN_TRUE;
 }
@@ -1374,6 +1423,10 @@ PHP_FUNCTION(session_unset)
        char     *variable;
        ulong     num_key;
        
+       if (ZEND_NUM_ARGS() != 0) {
+               WRONG_PARAM_COUNT;
+       }
+
        if (PS(session_status) == php_session_none)
                RETURN_FALSE;
 
@@ -1389,6 +1442,7 @@ PHP_FUNCTION(session_unset)
 
        /* Clean $HTTP_SESSION_VARS. */
        zend_hash_clean(Z_ARRVAL_P(PS(http_session_vars)));
+       RETURN_TRUE;
 }
 /* }}} */