kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 07:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip/location: Fix memory leak in permanent_uri_handler

Browse Source 
When permanent_uri_handler was creating the contact status
object for each contact, it wasn't unreffing it at the
end of the loop.

ASTERISK-25141 #close
Reported-by: Corey Farrell

Change-Id: I7bb127994677bb3d459f87952f8425c9b9967b12
This commit is contained in:
George Joseph
2015-05-29 15:19:26 -06:00
parent 1558a89129
commit 857166b5e5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_pjsip/location.c
View File

@@ -354,6 +354,7 @@ static int permanent_uri_handler(const struct aco_option *opt, struct ast_variab
contacts = ast_strdupa(var->value); contacts = ast_strdupa(var->value);
while ((contact_uri = strsep(&contacts, ","))) { while ((contact_uri = strsep(&contacts, ","))) {
struct ast_sip_contact *contact; struct ast_sip_contact *contact;
struct ast_sip_contact_status *status;
char contact_id[strlen(aor_id) + strlen(contact_uri) + 2 + 1]; char contact_id[strlen(aor_id) + strlen(contact_uri) + 2 + 1];
if (ast_sip_push_task_synchronous(NULL, permanent_contact_validate, contact_uri)) { if (ast_sip_push_task_synchronous(NULL, permanent_contact_validate, contact_uri)) {
@@ -376,10 +377,12 @@ static int permanent_uri_handler(const struct aco_option *opt, struct ast_variab
return -1; return -1;
} }
if (!ast_res_pjsip_find_or_create_contact_status(contact)) { status = ast_res_pjsip_find_or_create_contact_status(contact);
if (!status) {
ao2_ref(contact, -1); ao2_ref(contact, -1);
return -1; return -1;
} }
ao2_ref(status, -1);
ast_string_field_set(contact, uri, contact_uri); ast_string_field_set(contact, uri, contact_uri);
ao2_link(aor->permanent_contacts, contact); ao2_link(aor->permanent_contacts, contact);