Session: use more appropriate types

Girgias · Girgias · commit 4a5699ae2fb7 · 2022-05-29T15:24:06.000+01:00
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
@@ -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};
diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c
@@ -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);
 
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c
@@ -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
 
diff --git a/ext/session/mod_user_class.c b/ext/session/mod_user_class.c
@@ -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);
 }
 /* }}} */
 
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
@@ -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);							\
diff --git a/ext/session/session.c b/ext/session/session.c

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ static void ps_files_open(ps_files data, const char key)`
`155`	`155`	`{`
`156`	`156`	`char buf[MAXPATHLEN];`
`157`	`157`	`#if !defined(O_NOFOLLOW) \|\| !defined(PHP_WIN32)`
`158`		`- struct stat sbuf;`
	`158`	`+ struct stat sbuf = {0};`
`159`	`159`	`#endif`
`160`	`160`	`int ret;`
`161`	`161`
`@@ -226,7 +226,7 @@ static void ps_files_open(ps_files data, const char key)`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
`229`		`-static int ps_files_write(ps_files data, zend_string key, zend_string *val)`
	`229`	`+static zend_result ps_files_write(ps_files data, zend_string key, zend_string *val)`
`230`	`230`	`{`
`231`	`231`	`size_t n = 0;`
`232`	`232`
`@@ -337,7 +337,7 @@ static int ps_files_cleanup_dir(const char *dirname, zend_long maxlifetime)`
`337`	`337`	`return (nrdels);`
`338`	`338`	`}`
`339`	`339`
`340`		`-static int ps_files_key_exists(ps_files data, const char key)`
	`340`	`+static zend_result ps_files_key_exists(ps_files data, const char key)`
`341`	`341`	`{`
`342`	`342`	`char buf[MAXPATHLEN];`
`343`	`343`	`zend_stat_t sbuf = {0};`