kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 11:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

channelstorage_cpp_map_name_id: Fix callback returning non-matching channels.

Browse Source 
When the callback() API was invoked but no channel passed the test, callback
would return the last channel tested instead of NULL.  It now correctly
returns NULL when no channel matches.

Resolves: #1288
This commit is contained in:
George Joseph
2025-07-09 11:14:55 -06:00
committed by Ben Ford
parent 2cdb9de219
commit dde405c067
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/channelstorage_cpp_map_name_id.cc
View File

@@ -151,12 +151,13 @@ static struct ast_channel *callback(struct ast_channelstorage_instance *driver,
chan = it->second; chan = it->second;
if (cb_fn(chan, arg, data, ao2_flags) == (CMP_MATCH | CMP_STOP)) { if (cb_fn(chan, arg, data, ao2_flags) == (CMP_MATCH | CMP_STOP)) {
ao2_bump(chan); ao2_bump(chan);
break; unlock(driver);
return chan;
} }
} }
unlock(driver); unlock(driver);
return chan; return NULL;
} }
enum cpp_map_iterator_type { enum cpp_map_iterator_type {