php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Session: use more appropriate types

Browse Source
This commit is contained in:
George Peter Banyard
2022-05-27 15:35:14 +01:00
parent d08451b2ca
commit 4a5699ae2f
6 changed files with 81 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/session/mod_files.c
View File

@@ -155,7 +155,7 @@ static void ps_files_open(ps_files *data, const char *key)
{
char buf[MAXPATHLEN];
#if !defined(O_NOFOLLOW) || !defined(PHP_WIN32)
struct stat sbuf;
struct stat sbuf = {0};
#endif
int ret;
@@ -226,7 +226,7 @@ static void ps_files_open(ps_files *data, const char *key)
}
}
static int ps_files_write(ps_files *data, zend_string *key, zend_string *val)
static zend_result ps_files_write(ps_files *data, zend_string *key, zend_string *val)
{
size_t n = 0;
@@ -337,7 +337,7 @@ static int ps_files_cleanup_dir(const char *dirname, zend_long maxlifetime)
return (nrdels);
}
static int ps_files_key_exists(ps_files *data, const char *key)
static zend_result ps_files_key_exists(ps_files *data, const char *key)
{
char buf[MAXPATHLEN];
zend_stat_t sbuf = {0};

25
ext/session/mod_mm.c
View File

@@ -64,7 +64,7 @@ static ps_mm *ps_mm_instance = NULL;
# define ps_mm_debug(a)
#endif
static inline uint32_t ps_sd_hash(const char *data, int len)
static inline uint32_t ps_sd_hash(const char *data, size_t len)
{
uint32_t h;
const char *e = data + len;
@@ -110,7 +110,7 @@ static ps_sd *ps_sd_new(ps_mm *data, const char *key)
{
uint32_t hv, slot;
ps_sd *sd;
int keylen;
size_t keylen;
keylen = strlen(key);
@@ -172,7 +172,7 @@ static void ps_sd_destroy(ps_mm *data, ps_sd *sd)
mm_free(data->mm, sd);
}
static ps_sd *ps_sd_lookup(ps_mm *data, const char *key, int rw)
static ps_sd *ps_sd_lookup(ps_mm *data, const char *key, bool rw)
{
uint32_t hv, slot;
ps_sd *ret, *prev;
@@ -201,7 +201,7 @@ static ps_sd *ps_sd_lookup(ps_mm *data, const char *key, int rw)
return ret;
}
static int ps_mm_key_exists(ps_mm *data, const char *key)
static zend_result ps_mm_key_exists(ps_mm *data, const char *key)
{
ps_sd *sd;
@@ -221,7 +221,7 @@ const ps_module ps_mod_mm = {
#define PS_MM_DATA ps_mm *data = PS_GET_MOD_DATA()
static int ps_mm_initialize(ps_mm *data, const char *path)
static zend_result ps_mm_initialize(ps_mm *data, const char *path)
{
data->owner = getpid();
data->mm = mm_create(0, path);
@@ -242,7 +242,6 @@ static int ps_mm_initialize(ps_mm *data, const char *path)
static void ps_mm_destroy(ps_mm *data)
{
int h;
ps_sd *sd, *next;
/* This function is called during each module shutdown,
@@ -252,7 +251,7 @@ static void ps_mm_destroy(ps_mm *data)
return;
}
for (h = 0; h < data->hash_max + 1; h++) {
for (int h = 0; h < data->hash_max + 1; h++) {
for (sd = data->hash[h]; sd; sd = next) {
next = sd->next;
ps_sd_destroy(data, sd);
@@ -266,11 +265,11 @@ static void ps_mm_destroy(ps_mm *data)
PHP_MINIT_FUNCTION(ps_mm)
{
int save_path_len = strlen(PS(save_path));
int mod_name_len = strlen(sapi_module.name);
int euid_len;
size_t save_path_len = strlen(PS(save_path));
size_t mod_name_len = strlen(sapi_module.name);
size_t euid_len;
char *ps_mm_path, euid[30];
int ret;
zend_result ret;
ps_mm_instance = calloc(sizeof(*ps_mm_instance), 1);
if (!ps_mm_instance) {
@@ -302,7 +301,7 @@ PHP_MINIT_FUNCTION(ps_mm)
efree(ps_mm_path);
if (ret != SUCCESS) {
if (ret == FAILURE) {
free(ps_mm_instance);
ps_mm_instance = NULL;
return FAILURE;
@@ -344,7 +343,7 @@ PS_READ_FUNC(mm)
{
PS_MM_DATA;
ps_sd *sd;
int ret = FAILURE;
zend_result ret = FAILURE;
mm_lock(data->mm, MM_LOCK_RD);

2
ext/session/mod_user.c
View File

@@ -47,7 +47,7 @@ static void ps_call_handler(zval *func, int argc, zval *argv, zval *retval)
#define STDVARS \
zval retval; \
int ret = FAILURE
zend_result ret = FAILURE
#define PSF(a) PS(mod_user_names).name.ps_##a

8
ext/session/mod_user_class.c
View File

@@ -39,7 +39,7 @@ PHP_METHOD(SessionHandler, open)
{
char *save_path = NULL, *session_name = NULL;
size_t save_path_len, session_name_len;
int ret;
zend_result ret;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &save_path, &save_path_len, &session_name, &session_name_len) == FAILURE) {
RETURN_THROWS();
@@ -56,14 +56,14 @@ PHP_METHOD(SessionHandler, open)
zend_bailout();
} zend_end_try();
RETVAL_BOOL(SUCCESS == ret);
RETURN_BOOL(SUCCESS == ret);
}
/* }}} */
/* {{{ Wraps the old close handler */
PHP_METHOD(SessionHandler, close)
{
int ret;
zend_result ret;
// don't return on failure, since not closing the default handler
// could result in memory leaks or other nasties
@@ -80,7 +80,7 @@ PHP_METHOD(SessionHandler, close)
zend_bailout();
} zend_end_try();
RETVAL_BOOL(SUCCESS == ret);
RETURN_BOOL(SUCCESS == ret);
}
/* }}} */

52
ext/session/php_session.h
View File

@@ -39,29 +39,29 @@
typedef struct ps_module_struct {
const char *s_name;
int (*s_open)(PS_OPEN_ARGS);
int (*s_close)(PS_CLOSE_ARGS);
int (*s_read)(PS_READ_ARGS);
int (*s_write)(PS_WRITE_ARGS);
int (*s_destroy)(PS_DESTROY_ARGS);
zend_result (*s_open)(PS_OPEN_ARGS);
zend_result (*s_close)(PS_CLOSE_ARGS);
zend_result (*s_read)(PS_READ_ARGS);
zend_result (*s_write)(PS_WRITE_ARGS);
zend_result (*s_destroy)(PS_DESTROY_ARGS);
zend_long (*s_gc)(PS_GC_ARGS);
zend_string *(*s_create_sid)(PS_CREATE_SID_ARGS);
int (*s_validate_sid)(PS_VALIDATE_SID_ARGS);
int (*s_update_timestamp)(PS_UPDATE_TIMESTAMP_ARGS);
zend_result (*s_validate_sid)(PS_VALIDATE_SID_ARGS);
zend_result (*s_update_timestamp)(PS_UPDATE_TIMESTAMP_ARGS);
} ps_module;
#define PS_GET_MOD_DATA() *mod_data
#define PS_SET_MOD_DATA(a) *mod_data = (a)
#define PS_OPEN_FUNC(x) int ps_open_##x(PS_OPEN_ARGS)
#define PS_CLOSE_FUNC(x) int ps_close_##x(PS_CLOSE_ARGS)
#define PS_READ_FUNC(x) int ps_read_##x(PS_READ_ARGS)
#define PS_WRITE_FUNC(x) int ps_write_##x(PS_WRITE_ARGS)
#define PS_DESTROY_FUNC(x) int ps_delete_##x(PS_DESTROY_ARGS)
#define PS_OPEN_FUNC(x) zend_result ps_open_##x(PS_OPEN_ARGS)
#define PS_CLOSE_FUNC(x) zend_result ps_close_##x(PS_CLOSE_ARGS)
#define PS_READ_FUNC(x) zend_result ps_read_##x(PS_READ_ARGS)
#define PS_WRITE_FUNC(x) zend_result ps_write_##x(PS_WRITE_ARGS)
#define PS_DESTROY_FUNC(x) zend_result ps_delete_##x(PS_DESTROY_ARGS)
#define PS_GC_FUNC(x) zend_long ps_gc_##x(PS_GC_ARGS)
#define PS_CREATE_SID_FUNC(x) zend_string *ps_create_sid_##x(PS_CREATE_SID_ARGS)
#define PS_VALIDATE_SID_FUNC(x) int ps_validate_sid_##x(PS_VALIDATE_SID_ARGS)
#define PS_UPDATE_TIMESTAMP_FUNC(x) int ps_update_timestamp_##x(PS_UPDATE_TIMESTAMP_ARGS)
#define PS_VALIDATE_SID_FUNC(x) zend_result ps_validate_sid_##x(PS_VALIDATE_SID_ARGS)
#define PS_UPDATE_TIMESTAMP_FUNC(x) zend_result ps_update_timestamp_##x(PS_UPDATE_TIMESTAMP_ARGS)
/* Legacy save handler module definitions */
#define PS_FUNCS(x) \
@@ -224,7 +224,7 @@ ZEND_TSRMLS_CACHE_EXTERN()
typedef struct ps_serializer_struct {
const char *name;
zend_string *(*encode)(PS_SERIALIZER_ENCODE_ARGS);
int (*decode)(PS_SERIALIZER_DECODE_ARGS);
zend_result (*decode)(PS_SERIALIZER_DECODE_ARGS);
} ps_serializer;
#define PS_SERIALIZER_ENCODE_NAME(x) ps_srlzr_encode_##x
@@ -233,7 +233,7 @@ typedef struct ps_serializer_struct {
#define PS_SERIALIZER_ENCODE_FUNC(x) \
zend_string *PS_SERIALIZER_ENCODE_NAME(x)(PS_SERIALIZER_ENCODE_ARGS)
#define PS_SERIALIZER_DECODE_FUNC(x) \
int PS_SERIALIZER_DECODE_NAME(x)(PS_SERIALIZER_DECODE_ARGS)
zend_result PS_SERIALIZER_DECODE_NAME(x)(PS_SERIALIZER_DECODE_ARGS)
#define PS_SERIALIZER_FUNCS(x) \
PS_SERIALIZER_ENCODE_FUNC(x); \
@@ -245,30 +245,30 @@ typedef struct ps_serializer_struct {
/* default create id function */
PHPAPI zend_string *php_session_create_id(PS_CREATE_SID_ARGS);
/* Dummy PS module functions */
PHPAPI int php_session_validate_sid(PS_VALIDATE_SID_ARGS);
PHPAPI int php_session_update_timestamp(PS_UPDATE_TIMESTAMP_ARGS);
PHPAPI zend_result php_session_validate_sid(PS_VALIDATE_SID_ARGS);
PHPAPI zend_result php_session_update_timestamp(PS_UPDATE_TIMESTAMP_ARGS);
PHPAPI void session_adapt_url(const char *url, size_t url_len, char **new_url, size_t *new_len);
PHPAPI int php_session_destroy(void);
PHPAPI zend_result php_session_destroy(void);
PHPAPI void php_add_session_var(zend_string *name);
PHPAPI zval *php_set_session_var(zend_string *name, zval *state_val, php_unserialize_data_t *var_hash);
PHPAPI zval *php_get_session_var(zend_string *name);
PHPAPI int php_session_register_module(const ps_module *);
PHPAPI zend_result php_session_register_module(const ps_module *);
PHPAPI int php_session_register_serializer(const char *name,
PHPAPI zend_result php_session_register_serializer(const char *name,
zend_string *(*encode)(PS_SERIALIZER_ENCODE_ARGS),
int (*decode)(PS_SERIALIZER_DECODE_ARGS));
zend_result (*decode)(PS_SERIALIZER_DECODE_ARGS));
PHPAPI int php_session_start(void);
PHPAPI int php_session_flush(int write);
PHPAPI zend_result php_session_start(void);
PHPAPI zend_result php_session_flush(int write);
PHPAPI const ps_module *_php_find_ps_module(const char *name);
PHPAPI const ps_serializer *_php_find_ps_serializer(const char *name);
PHPAPI int php_session_valid_key(const char *key);
PHPAPI int php_session_reset_id(void);
PHPAPI zend_result php_session_valid_key(const char *key);
PHPAPI zend_result php_session_reset_id(void);
#define PS_ADD_VARL(name) do { \
php_add_session_var(name); \

77
ext/session/session.c
View File

@@ -149,9 +149,9 @@ static inline void php_rshutdown_session_globals(void) /* {{{ */
}
/* }}} */
PHPAPI int php_session_destroy(void) /* {{{ */
PHPAPI zend_result php_session_destroy(void) /* {{{ */
{
int retval = SUCCESS;
zend_result retval = SUCCESS;
if (PS(session_status) != php_session_active) {
php_error_docref(NULL, E_WARNING, "Trying to destroy uninitialized session");
@@ -240,7 +240,7 @@ static zend_string *php_session_encode(void) /* {{{ */
}
/* }}} */
static int php_session_decode(zend_string *data) /* {{{ */
static zend_result php_session_decode(zend_string *data) /* {{{ */
{
if (!PS(serializer)) {
php_error_docref(NULL, E_WARNING, "Unknown session.serialize_handler. Failed to decode session object");
@@ -327,12 +327,12 @@ PHPAPI zend_string *php_session_create_id(PS_CREATE_SID_ARGS) /* {{{ */
/* Default session id char validation function allowed by ps_modules.
* If you change the logic here, please also update the error message in
* ps_modules appropriately */
PHPAPI int php_session_valid_key(const char *key) /* {{{ */
PHPAPI zend_result php_session_valid_key(const char *key) /* {{{ */
{
size_t len;
const char *p;
char c;
int ret = SUCCESS;
zend_result ret = SUCCESS;
for (p = key; (c = *p); p++) {
/* valid characters are a..z,A..Z,0..9 */
@@ -378,7 +378,7 @@ static zend_long php_session_gc(bool immediate) /* {{{ */
return num;
} /* }}} */
static int php_session_initialize(void) /* {{{ */
static zend_result php_session_initialize(void) /* {{{ */
{
zend_string *val = NULL;
@@ -468,7 +468,7 @@ static int php_session_initialize(void) /* {{{ */
static void php_session_save_current_state(int write) /* {{{ */
{
int ret = FAILURE;
zend_result ret = FAILURE;
if (write) {
IF_SESSION_VARS() {
@@ -864,7 +864,7 @@ PS_SERIALIZER_DECODE_FUNC(php_serialize) /* {{{ */
const char *endptr = val + vallen;
zval session_vars;
php_unserialize_data_t var_hash;
int result;
bool result;
zend_string *var_name = zend_string_init("_SESSION", sizeof("_SESSION") - 1, 0);
ZVAL_NULL(&session_vars);
@@ -921,7 +921,6 @@ PS_SERIALIZER_DECODE_FUNC(php_binary) /* {{{ */
{
const char *p;
const char *endptr = val + vallen;
int namelen;
zend_string *name;
php_unserialize_data_t var_hash;
zval *current, rv;
@@ -929,7 +928,8 @@ PS_SERIALIZER_DECODE_FUNC(php_binary) /* {{{ */
PHP_VAR_UNSERIALIZE_INIT(var_hash);
for (p = val; p < endptr; ) {
namelen = ((unsigned char)(*p)) & (~PS_BIN_UNDEF);
// Can this be changed to size_t?
int namelen = ((unsigned char)(*p)) & (~PS_BIN_UNDEF);
if (namelen < 0 || namelen > PS_BIN_MAX || (p + namelen) >= endptr) {
PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
@@ -993,7 +993,7 @@ PS_SERIALIZER_DECODE_FUNC(php) /* {{{ */
const char *endptr = val + vallen;
ptrdiff_t namelen;
zend_string *name;
int retval = SUCCESS;
zend_result retval = SUCCESS;
php_unserialize_data_t var_hash;
zval *current, rv;
@@ -1045,12 +1045,11 @@ static ps_serializer ps_serializers[MAX_SERIALIZERS + 1] = {
PS_SERIALIZER_ENTRY(php_binary)
};
PHPAPI int php_session_register_serializer(const char *name, zend_string *(*encode)(PS_SERIALIZER_ENCODE_ARGS), int (*decode)(PS_SERIALIZER_DECODE_ARGS)) /* {{{ */
PHPAPI zend_result php_session_register_serializer(const char *name, zend_string *(*encode)(PS_SERIALIZER_ENCODE_ARGS), zend_result (*decode)(PS_SERIALIZER_DECODE_ARGS)) /* {{{ */
{
int ret = FAILURE;
int i;
zend_result ret = FAILURE;
for (i = 0; i < MAX_SERIALIZERS; i++) {
for (int i = 0; i < MAX_SERIALIZERS; i++) {
if (ps_serializers[i].name == NULL) {
ps_serializers[i].name = name;
ps_serializers[i].encode = encode;
@@ -1076,12 +1075,11 @@ static const ps_module *ps_modules[MAX_MODULES + 1] = {
ps_user_ptr
};
PHPAPI int php_session_register_module(const ps_module *ptr) /* {{{ */
PHPAPI zend_result php_session_register_module(const ps_module *ptr) /* {{{ */
{
int ret = FAILURE;
int i;
for (i = 0; i < MAX_MODULES; i++) {
for (int i = 0; i < MAX_MODULES; i++) {
if (!ps_modules[i]) {
ps_modules[i] = ptr;
ret = SUCCESS;
@@ -1093,12 +1091,12 @@ PHPAPI int php_session_register_module(const ps_module *ptr) /* {{{ */
/* }}} */
/* Dummy PS module function */
PHPAPI int php_session_validate_sid(PS_VALIDATE_SID_ARGS) {
PHPAPI zend_result php_session_validate_sid(PS_VALIDATE_SID_ARGS) {
return SUCCESS;
}
/* Dummy PS module function */
PHPAPI int php_session_update_timestamp(PS_UPDATE_TIMESTAMP_ARGS) {
PHPAPI zend_result php_session_update_timestamp(PS_UPDATE_TIMESTAMP_ARGS) {
return SUCCESS;
}
@@ -1306,7 +1304,7 @@ static void php_session_remove_cookie(void) {
efree(session_cookie);
}
static int php_session_send_cookie(void) /* {{{ */
static zend_result php_session_send_cookie(void) /* {{{ */
{
smart_str ncookie = {0};
zend_string *date_fmt = NULL;
@@ -1436,7 +1434,7 @@ static void ppid2sid(zval *ppid) {
}
PHPAPI int php_session_reset_id(void) /* {{{ */
PHPAPI zend_result php_session_reset_id(void) /* {{{ */
{
int module_number = PS(module_number);
zval *sid, *data, *ppid;
@@ -1506,7 +1504,7 @@ PHPAPI int php_session_reset_id(void) /* {{{ */
/* }}} */
PHPAPI int php_session_start(void) /* {{{ */
PHPAPI zend_result php_session_start(void) /* {{{ */
{
zval *ppid;
zval *data;
@@ -1629,7 +1627,7 @@ PHPAPI int php_session_start(void) /* {{{ */
}
/* }}} */
PHPAPI int php_session_flush(int write) /* {{{ */
PHPAPI zend_result php_session_flush(int write) /* {{{ */
{
if (PS(session_status) == php_session_active) {
php_session_save_current_state(write);
@@ -1640,7 +1638,7 @@ PHPAPI int php_session_flush(int write) /* {{{ */
}
/* }}} */
static int php_session_abort(void) /* {{{ */
static zend_result php_session_abort(void) /* {{{ */
{
if (PS(session_status) == php_session_active) {
if (PS(mod_data) || PS(mod_user_implemented)) {
@@ -1653,7 +1651,7 @@ static int php_session_abort(void) /* {{{ */
}
/* }}} */
static int php_session_reset(void) /* {{{ */
static zend_result php_session_reset(void) /* {{{ */
{
if (PS(session_status) == php_session_active
&& php_session_initialize() == SUCCESS) {
@@ -1689,7 +1687,7 @@ PHP_FUNCTION(session_set_cookie_params)
bool secure = 0, secure_null = 1;
bool httponly = 0, httponly_null = 1;
zend_string *ini_name;
int result;
zend_result result;
int found = 0;
if (!PS(use_cookies)) {
@@ -1947,7 +1945,7 @@ PHP_FUNCTION(session_module_name)
}
/* }}} */
static int save_handler_check_session(void) {
static zend_result save_handler_check_session(void) {
if (PS(session_status) == php_session_active) {
php_error_docref(NULL, E_WARNING, "Session save handler cannot be changed when a session is active");
return FAILURE;
@@ -2169,9 +2167,8 @@ PHP_FUNCTION(session_save_path)
PHP_FUNCTION(session_id)
{
zend_string *name = NULL;
int argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc, "|S!", &name) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|S!", &name) == FAILURE) {
RETURN_THROWS();
}
@@ -2238,7 +2235,7 @@ PHP_FUNCTION(session_regenerate_id)
RETURN_FALSE;
}
} else {
int ret;
zend_result ret;
data = php_session_encode();
if (data) {
ret = PS(mod)->s_write(&PS(mod_data), PS(id), data, PS(gc_maxlifetime));
@@ -2471,8 +2468,8 @@ PHP_FUNCTION(session_decode)
}
/* }}} */
static int php_session_start_set_ini(zend_string *varname, zend_string *new_value) {
int ret;
static zend_result php_session_start_set_ini(zend_string *varname, zend_string *new_value) {
zend_result ret;
smart_str buf ={0};
smart_str_appends(&buf, "session");
smart_str_appendc(&buf, '.');
@@ -2715,7 +2712,7 @@ PHP_FUNCTION(session_register_shutdown)
* Module Setup and Destruction *
******************************** */
static int php_rinit_session(bool auto_start) /* {{{ */
static zend_result php_rinit_session(bool auto_start) /* {{{ */
{
php_rinit_session_globals();
@@ -2759,8 +2756,6 @@ static PHP_RINIT_FUNCTION(session) /* {{{ */
static PHP_RSHUTDOWN_FUNCTION(session) /* {{{ */
{
int i;
if (PS(session_status) == php_session_active) {
zend_try {
php_session_flush(1);
@@ -2769,7 +2764,7 @@ static PHP_RSHUTDOWN_FUNCTION(session) /* {{{ */
php_rshutdown_session_globals();
/* this should NOT be done in php_rshutdown_session_globals() */
for (i = 0; i < PS_NUM_APIS; i++) {
for (int i = 0; i < PS_NUM_APIS; i++) {
if (!Z_ISUNDEF(PS(mod_user_names).names[i])) {
zval_ptr_dtor(&PS(mod_user_names).names[i]);
ZVAL_UNDEF(&PS(mod_user_names).names[i]);
@@ -2782,8 +2777,6 @@ static PHP_RSHUTDOWN_FUNCTION(session) /* {{{ */
static PHP_GINIT_FUNCTION(ps) /* {{{ */
{
int i;
#if defined(COMPILE_DL_SESSION) && defined(ZTS)
ZEND_TSRMLS_CACHE_UPDATE();
#endif
@@ -2801,7 +2794,7 @@ static PHP_GINIT_FUNCTION(ps) /* {{{ */
ps_globals->mod_user_is_open = 0;
ps_globals->session_vars = NULL;
ps_globals->set_handler = 0;
for (i = 0; i < PS_NUM_APIS; i++) {
for (int i = 0; i < PS_NUM_APIS; i++) {
ZVAL_UNDEF(&ps_globals->mod_user_names.names[i]);
}
ZVAL_UNDEF(&ps_globals->http_session_vars);
@@ -3020,10 +3013,10 @@ static void php_session_rfc1867_cleanup(php_session_rfc1867_progress *progress)
php_session_flush(1);
} /* }}} */
static int php_session_rfc1867_callback(unsigned int event, void *event_data, void **extra) /* {{{ */
static zend_result php_session_rfc1867_callback(unsigned int event, void *event_data, void **extra) /* {{{ */
{
php_session_rfc1867_progress *progress;
int retval = SUCCESS;
zend_result retval = SUCCESS;
if (php_session_rfc1867_orig_callback) {
retval = php_session_rfc1867_orig_callback(event, event_data, extra);