kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Core] Database handles: Fix possible hash collision in get_handle().

This commit is contained in:
Andrey Volk 2024-02-08 14:41:01 +03:00
parent 9df3076f29
commit e7f38452ba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/switch_core_sqldb.c
View File

@ -195,7 +195,7 @@ static switch_cache_db_handle_t *get_handle(const char *db_str, const char *user
This allows SQLite to read and write within a single thread, giving the same handle for both operations.
*/
for (dbh_ptr = sql_manager.handle_pool; dbh_ptr; dbh_ptr = dbh_ptr->next) {
if (dbh_ptr->thread_hash == thread_hash && dbh_ptr->hash == hash &&
if (dbh_ptr->thread_hash == thread_hash && dbh_ptr->hash == hash && !strcmp(dbh_ptr->name, db_str) &&
!switch_test_flag(dbh_ptr, CDF_PRUNE) && switch_mutex_trylock(dbh_ptr->mutex) == SWITCH_STATUS_SUCCESS) {
r = dbh_ptr;
break;
@ -207,7 +207,7 @@ static switch_cache_db_handle_t *get_handle(const char *db_str, const char *user
If a handle is in use, skip and create new one.
*/
for (dbh_ptr = sql_manager.handle_pool; dbh_ptr; dbh_ptr = dbh_ptr->next) {
if (dbh_ptr->hash == hash && !dbh_ptr->use_count && !switch_test_flag(dbh_ptr, CDF_PRUNE) &&
if (dbh_ptr->hash == hash && !strcmp(dbh_ptr->name, db_str) && !dbh_ptr->use_count && !switch_test_flag(dbh_ptr, CDF_PRUNE) &&
switch_mutex_trylock(dbh_ptr->mutex) == SWITCH_STATUS_SUCCESS) {
r = dbh_ptr;
r->thread_hash = thread_hash;