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

ext/dba: Use zend_string for resource key instead of char*

Browse Source 
At multiple time we would be creating a zend_string anyway
This commit is contained in:
Gina Peter Banyard
2024-10-04 14:19:23 +01:00
parent 50d515b9a7
commit 41217bb06c
1 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
ext/dba/dba.c
View File

@@ -569,8 +569,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
RETURN_THROWS();
}
char *resource_key;
size_t resource_key_len = spprintf(&resource_key, 0,
zend_string *resource_key = zend_strpprintf(0,
"dba_%d_%s_%s_%s", persistent, ZSTR_VAL(path), ZSTR_VAL(mode), handler_str ? ZSTR_VAL(handler_str) : ""
);
@@ -578,27 +577,25 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
zend_resource *le;
/* try to find if we already have this link in our persistent list */
if ((le = zend_hash_str_find_ptr(&EG(persistent_list), resource_key, resource_key_len)) != NULL) {
if ((le = zend_hash_find_ptr(&EG(persistent_list), resource_key)) != NULL) {
if (le->type != le_pdb) {
// TODO This should never happen
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_FALSE;
}
object_init_ex(return_value, dba_connection_ce);
dba_connection *connection = Z_DBA_CONNECTION_P(return_value);
connection->info = (dba_info *)le->ptr;
connection->hash = zend_string_init(resource_key, resource_key_len, persistent);
if (persistent) {
GC_MAKE_PERSISTENT_LOCAL(connection->hash);
}
connection->hash = zend_string_dup(resource_key, /* persistent */ true);
GC_MAKE_PERSISTENT_LOCAL(connection->hash);
if (zend_hash_exists(&DBA_G(connections), connection->hash)) {
zend_hash_del(&DBA_G(connections), connection->hash);
}
zend_hash_add_new(&DBA_G(connections), connection->hash, return_value);
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
return;
}
}
@@ -607,7 +604,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
hptr = DBA_G(default_hptr);
if (!hptr) {
php_error_docref(NULL, E_WARNING, "No default handler selected");
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_FALSE;
}
ZEND_ASSERT(hptr->name);
@@ -617,7 +614,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
if (!hptr->name) {
php_error_docref(NULL, E_WARNING, "Handler \"%s\" is not available", ZSTR_VAL(handler_str));
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_FALSE;
}
}
@@ -641,13 +638,13 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
if (ZSTR_LEN(mode) > 3) {
zend_argument_value_error(2, "must be at most 3 characters");
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_THROWS();
}
if (ZSTR_LEN(mode) == 3) {
if (ZSTR_VAL(mode)[2] != 't') {
zend_argument_value_error(2, "third character must be \"t\"");
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_THROWS();
}
is_test_lock = true;
@@ -660,7 +657,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
case '-':
if ((hptr->flags & DBA_LOCK_ALL) == 0) {
php_error_docref(NULL, E_WARNING, "Locking cannot be disabled for handler %s", hptr->name);
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_FALSE;
}
is_lock_ignored = true;
@@ -682,7 +679,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
break;
default:
zend_argument_value_error(2, "second character must be one of \"d\", \"l\", \"-\", or \"t\"");
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_THROWS();
}
} else {
@@ -751,7 +748,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
break;
default:
zend_argument_value_error(2, "first character must be one of \"r\", \"w\", \"c\", or \"n\"");
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_THROWS();
}
if (!lock_file_mode) {
@@ -760,17 +757,17 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
if (is_test_lock) {
if (is_lock_ignored) {
zend_argument_value_error(2, "cannot combine mode \"-\" (no lock) and \"t\" (test lock)");
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_THROWS();
}
if (!lock_mode) {
if ((hptr->flags & DBA_LOCK_ALL) == 0) {
php_error_docref(NULL, E_WARNING, "Handler %s uses its own locking which doesn't support mode modifier t (test lock)", hptr->name);
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_FALSE;
} else {
php_error_docref(NULL, E_WARNING, "Handler %s doesn't uses locking for this mode which makes modifier t (test lock) obsolete", hptr->name);
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_FALSE;
}
} else {
@@ -780,7 +777,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
zval *connection_zval;
dba_connection *connection;
if ((connection_zval = zend_hash_str_find(&DBA_G(connections), resource_key, resource_key_len)) == NULL) {
if ((connection_zval = zend_hash_find(&DBA_G(connections), resource_key)) == NULL) {
object_init_ex(return_value, dba_connection_ce);
connection = Z_DBA_CONNECTION_P(return_value);
@@ -792,9 +789,11 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
connection->info->driver_flags = driver_flags;
connection->info->flags = (hptr->flags & ~DBA_LOCK_ALL) | (lock_flag & DBA_LOCK_ALL) | (persistent ? DBA_PERSISTENT : 0);
connection->info->lock.mode = lock_mode;
connection->hash = zend_string_init(resource_key, resource_key_len, persistent);
if (persistent) {
connection->hash = zend_string_dup(resource_key, /* persistent */ true);
GC_MAKE_PERSISTENT_LOCAL(connection->hash);
} else {
connection->hash = zend_string_copy(resource_key);
}
} else {
ZVAL_COPY(return_value, connection_zval);
@@ -860,7 +859,7 @@ restart:
}
if (!connection->info->lock.fp) {
/* stream operation already wrote an error message */
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
zval_ptr_dtor(return_value);
RETURN_FALSE;
}
@@ -881,7 +880,7 @@ restart:
}
if (!connection->info->fp) {
/* stream operation already wrote an error message */
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
zval_ptr_dtor(return_value);
RETURN_FALSE;
}
@@ -891,7 +890,7 @@ restart:
*/
if (SUCCESS != php_stream_cast(connection->info->fp, PHP_STREAM_AS_FD, (void*)&connection->info->fd, 1)) {
php_error_docref(NULL, E_WARNING, "Could not cast stream");
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
zval_ptr_dtor(return_value);
RETURN_FALSE;
#ifdef F_SETFL
@@ -927,7 +926,7 @@ restart:
php_error_docref(NULL, E_WARNING, "Driver initialization failed for handler: %s", hptr->name);
}
}
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
zval_ptr_dtor(return_value);
RETURN_FALSE;
}
@@ -935,16 +934,16 @@ restart:
connection->info->hnd = hptr;
if (persistent) {
if (zend_register_persistent_resource(resource_key, resource_key_len, connection->info, le_pdb) == NULL) {
if (zend_register_persistent_resource_ex(connection->hash, connection->info, le_pdb) == NULL) {
php_error_docref(NULL, E_WARNING, "Could not register persistent resource");
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
zval_ptr_dtor(return_value);
RETURN_FALSE;
}
}
zend_hash_add_new(&DBA_G(connections), connection->hash, return_value);
efree(resource_key);
zend_string_release_ex(resource_key, /* persistent */ false);
}
/* }}} */