archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Create persistent interned string for password algos

Browse source 
These strings are returned to userland by password_algos(),
which violates thread-safety invariants. Create persistent
interned strings for them instead.
This commit is contained in:
Nikita Popov 2021-07-20 15:12:30 +02:00
parent 051ff33660
commit b0d4d6ebb4
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/standard/password.c
View file

@ -38,12 +38,8 @@
static zend_array php_password_algos; static zend_array php_password_algos;
int php_password_algo_register(const char *ident, const php_password_algo *algo) { int php_password_algo_register(const char *ident, const php_password_algo *algo) {
zval zalgo; zend_string *key = zend_string_init_interned(ident, strlen(ident), 1);
ZVAL_PTR(&zalgo, (php_password_algo*)algo); return zend_hash_add_ptr(&php_password_algos, key, (void *) algo) ? SUCCESS : FAILURE;
if (zend_hash_str_add(&php_password_algos, ident, strlen(ident), &zalgo)) {
return SUCCESS;
}
return FAILURE;
} }
void php_password_algo_unregister(const char *ident) { void php_password_algo_unregister(const char *ident) {