kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-04-28 17:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

channelstorage_cpp_map_name_id: Fix get_by_name_prefix prefix match

Browse Source 
Lower bound filter did not ensure prefix match.

Resolves: #1730
This commit is contained in:
Jasper Hafkenscheid
2026-01-21 07:51:36 +01:00
parent 9334a9945b
commit da8814524b
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main/channelstorage.c
View File

@@ -265,6 +265,25 @@ static void *test_storage_thread(void *data)
elapsed = ast_tvdiff_us(end, start);
ast_test_status_update(test, "%*s: %8ld\n", collen, "by name prefix", elapsed);
/* Test negative cases - prefixes that should NOT match */
start = ast_tvnow();
for (i = 0; i < 10; i++) {
/* Search for non-existent prefix between existing channels
* e.g., "TestChannel-{rand}-0000a" falls between 0000 and 0001
*/
sprintf(search1, "TestChannel-%ld-%04da", rand, i * 50);
mock_channel = CHANNELSTORAGE_API(storage_instance, get_by_name_prefix_or_uniqueid, search1, strlen(search1), 1);
ast_test_validate_cleanup_custom(test, mock_channel == NULL, res, done,
"Expected NULL for non-existent prefix '%s' but got '%s'\n",
search1, mock_channel ? ast_channel_name(mock_channel) : "NULL");
if (mock_channel) {
ast_channel_unref(mock_channel);
}
}
end = ast_tvnow();
elapsed = ast_tvdiff_us(end, start);
ast_test_status_update(test, "%*s: %8ld\n", collen, "prefix no-match", elapsed);
start = ast_tvnow();
for (i = 0; i < CHANNEL_COUNT; i++) {
sprintf(search1, "TestContext-%ld-%04d", rand, i % 100);

5
main/channelstorage_cpp_map_name_id.cc
View File

@@ -531,7 +531,10 @@ static struct ast_channel *get_by_name_prefix(struct ast_channelstorage_instance
}
auto rtn = getdb(driver).lower_bound(l_name);
if (rtn != getdb(driver).end()) {
chan = ao2_bump((struct ast_channel *)rtn->second);
/* Check if the channel name actually starts with the requested prefix */
if (rtn->first.compare(0, name_len, l_name, name_len) == 0) {
chan = ao2_bump((struct ast_channel *)rtn->second);
}
}
if (lock) {
unlock(driver);