Skip to content

ext/session: expose php_session_valid_key_ex #25081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sjord wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

ext/session: expose php_session_valid_key_ex #25081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/session/php_session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ PHPAPI php_session_status php_get_session_status(void);
PHPAPI const ps_module *_php_find_ps_module(const char *name);
PHPAPI const ps_serializer *_php_find_ps_serializer(const char *name);

PHPAPI zend_result php_session_valid_key(const char *key);
zend_result php_session_valid_key_ex(const zend_string *key);
PHPAPI ZEND_ATTRIBUTE_DEPRECATED zend_result php_session_valid_key(const char *key);
PHPAPI zend_result php_session_valid_key_ex(const zend_string *key);
PHPAPI zend_result php_session_reset_id(void);

/* Do not use a return statement in `code` because that may leak memory.
Expand Down
4 changes: 2 additions & 2 deletions ext/session/session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,14 +388,14 @@ static zend_result php_session_valid_key_len(const char *key, size_t key_len)
}

/* Validate the full zend_string, including embedded NUL bytes. */
zend_result php_session_valid_key_ex(const zend_string *key)
PHPAPI zend_result php_session_valid_key_ex(const zend_string *key)
{
return php_session_valid_key_len(ZSTR_VAL(key), ZSTR_LEN(key));
}

/* C-string compatibility wrapper. Callers that have a zend_string should use
* php_session_valid_key_ex() instead. */
PHPAPI zend_result php_session_valid_key(const char *key)
PHPAPI ZEND_ATTRIBUTE_DEPRECATED zend_result php_session_valid_key(const char *key)
{
return php_session_valid_key_len(key, strlen(key));
}
Expand Down
Loading