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

rtp_engine.c: Fix off nominal ref leak and some minor tweaks.

Browse Source 
v11 only fix.

Change-Id: I97885946ebc7eda19f1c18d08698117cf6a7f14f
This commit is contained in:
Richard Mudgett
2015-07-17 15:54:37 -05:00
parent 1b51b5efb6
commit 75185c5d8f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/rtp_engine.c
View File

@@ -512,16 +512,15 @@ void ast_rtp_codecs_payloads_copy(struct ast_rtp_codecs *src, struct ast_rtp_cod
new_type = ao2_find(dest->payloads, &i, OBJ_KEY | OBJ_NOLOCK); new_type = ao2_find(dest->payloads, &i, OBJ_KEY | OBJ_NOLOCK);
if (!new_type) { if (!new_type) {
new_type = ao2_alloc(sizeof(*new_type), NULL); new_type = ao2_alloc(sizeof(*new_type), NULL);
payload_alloced = 1;
}
if (!new_type) { if (!new_type) {
ao2_ref(type, -1);
continue; continue;
} }
payload_alloced = 1;
}
ast_debug(2, "Copying payload %d from %p to %p\n", i, src, dest); ast_debug(2, "Copying payload %d from %p to %p\n", i, src, dest);
new_type->payload = i;
*new_type = *type; *new_type = *type;
if (payload_alloced) { if (payload_alloced) {
@@ -560,7 +559,6 @@ void ast_rtp_codecs_payloads_set_m_type(struct ast_rtp_codecs *codecs, struct as
type->asterisk_format = static_RTP_PT[payload].asterisk_format; type->asterisk_format = static_RTP_PT[payload].asterisk_format;
type->rtp_code = static_RTP_PT[payload].rtp_code; type->rtp_code = static_RTP_PT[payload].rtp_code;
type->payload = payload;
ast_format_copy(&type->format, &static_RTP_PT[payload].format); ast_format_copy(&type->format, &static_RTP_PT[payload].format);
ast_debug(1, "Setting payload %d based on m type on %p\n", payload, codecs); ast_debug(1, "Setting payload %d based on m type on %p\n", payload, codecs);
@@ -610,7 +608,7 @@ int ast_rtp_codecs_payloads_set_rtpmap_type_rate(struct ast_rtp_codecs *codecs,
if (!(type = ao2_find(codecs->payloads, &pt, OBJ_KEY | OBJ_NOLOCK))) { if (!(type = ao2_find(codecs->payloads, &pt, OBJ_KEY | OBJ_NOLOCK))) {
if (!(type = ao2_alloc(sizeof(*type), NULL))) { if (!(type = ao2_alloc(sizeof(*type), NULL))) {
continue; break;
} }
type->payload = pt; type->payload = pt;
ao2_link_flags(codecs->payloads, type, OBJ_NOLOCK); ao2_link_flags(codecs->payloads, type, OBJ_NOLOCK);