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

res_pjsip_sdp_rtp fix leaking astobj2 ast_format

Browse Source 
PR #700 added a preferred_format for the struct ast_rtp_codecs,
but when set the preferred_format it leaks an astobj2 ast_format.
In the next code
ast_rtp_codecs_set_preferred_format(&codecs, ast_format_cap_get_format(joint, 0));
both functions ast_rtp_codecs_set_preferred_format
and ast_format_cap_get_format increases the ao2 reference count.

Fixes: #856
(cherry picked from commit 95fadcf6db)
This commit is contained in:
Alexei Gradinari
2024-08-23 16:28:24 -04:00
committed by Asterisk Development Team
parent 1073fd505d
commit 1ec83a5ca4
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/rtp_engine.c
View File

@@ -1011,6 +1011,7 @@ void ast_rtp_codecs_payloads_destroy(struct ast_rtp_codecs *codecs)
AST_VECTOR_FREE(&codecs->payload_mapping_tx);
ao2_t_cleanup(codecs->preferred_format, "destroying ast_rtp_codec preferred format");
codecs->preferred_format = NULL;
ast_rwlock_destroy(&codecs->codecs_lock);
}

5
res/res_pjsip_sdp_rtp.c
View File

@@ -544,7 +544,10 @@ static int set_caps(struct ast_sip_session *session,
ast_format_cap_get_names(caps, &usbuf),
ast_format_cap_get_names(peer, &thembuf));
} else {
ast_rtp_codecs_set_preferred_format(&codecs, ast_format_cap_get_format(joint, 0));
struct ast_format *preferred_fmt = ast_format_cap_get_format(joint, 0);
ast_rtp_codecs_set_preferred_format(&codecs, preferred_fmt);
ao2_ref(preferred_fmt, -1);
}
if (is_offer) {