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

rtp_engine.c: Prevent segfault in ast_rtp_codecs_payloads_unset()

Browse Source 
There can be empty slots in payload_mapping_tx corresponding to
dynamic payload types that haven't been seen before so we now
check for NULL before attempting to use 'type' in the call to
ast_format_cmp.

Note: Currently only chan_sip calls ast_rtp_codecs_payloads_unset()

Resolves: #822
This commit is contained in:
George Joseph
2024-07-25 06:53:43 -06:00
parent 5513a07969
commit 1090fc1315
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/rtp_engine.c
View File

@@ -1485,13 +1485,22 @@ void ast_rtp_codecs_payloads_unset(struct ast_rtp_codecs *codecs, struct ast_rtp
if (payload < AST_VECTOR_SIZE(&codecs->payload_mapping_tx)) { if (payload < AST_VECTOR_SIZE(&codecs->payload_mapping_tx)) {
type = AST_VECTOR_GET(&codecs->payload_mapping_tx, payload); type = AST_VECTOR_GET(&codecs->payload_mapping_tx, payload);
/* remove the preferred format if we are unsetting its container. */ /*
* Remove the preferred format if we are unsetting its container.
*
* There can be empty slots in payload_mapping_tx corresponding to
* dynamic payload types that haven't been seen before so we need
* to check for NULL before attempting to use 'type' in the call to
* ast_format_cmp.
*/
if (type) {
if (ast_format_cmp(type->format, codecs->preferred_format) == AST_FORMAT_CMP_EQUAL) { if (ast_format_cmp(type->format, codecs->preferred_format) == AST_FORMAT_CMP_EQUAL) {
ao2_replace(codecs->preferred_format, NULL); ao2_replace(codecs->preferred_format, NULL);
} }
ao2_cleanup(type); ao2_ref(type, -1);
AST_VECTOR_REPLACE(&codecs->payload_mapping_tx, payload, NULL); AST_VECTOR_REPLACE(&codecs->payload_mapping_tx, payload, NULL);
} }
}
if (instance && instance->engine && instance->engine->payload_set) { if (instance && instance->engine && instance->engine->payload_set) {
ao2_lock(instance); ao2_lock(instance);