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

Merge "res_pjsip: Fix initialization of extended stringfields." into 13

Browse Source
This commit is contained in:
Joshua Colp
2018-04-24 18:59:01 -05:00
committed by Gerrit Code Review
parent 4f07ed445f ea14243971
commit cb4e991181
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_pjsip/location.c
View File

@@ -118,16 +118,15 @@ static void *contact_alloc(const char *name)
return NULL; return NULL;
} }
if (ast_string_field_init(contact, 256)) { if (ast_string_field_init(contact, 256)
|| ast_string_field_init_extended(contact, endpoint_name)
|| ast_string_field_init_extended(contact, reg_server)
|| ast_string_field_init_extended(contact, via_addr)
|| ast_string_field_init_extended(contact, call_id)) {
ao2_cleanup(contact); ao2_cleanup(contact);
return NULL; return NULL;
} }
ast_string_field_init_extended(contact, endpoint_name);
ast_string_field_init_extended(contact, reg_server);
ast_string_field_init_extended(contact, via_addr);
ast_string_field_init_extended(contact, call_id);
/* Dynamic contacts are delimited with ";@" and static ones with "@@" */ /* Dynamic contacts are delimited with ";@" and static ones with "@@" */
if ((aor_separator = strstr(id, ";@")) || (aor_separator = strstr(id, "@@"))) { if ((aor_separator = strstr(id, ";@")) || (aor_separator = strstr(id, "@@"))) {
*aor_separator = '\0'; *aor_separator = '\0';

5
res/res_pjsip/pjsip_configuration.c
View File

@@ -2197,13 +2197,12 @@ void *ast_sip_endpoint_alloc(const char *name)
if (!endpoint) { if (!endpoint) {
return NULL; return NULL;
} }
if (ast_string_field_init(endpoint, 64)) { if (ast_string_field_init(endpoint, 64)
|| ast_string_field_init_extended(endpoint, incoming_mwi_mailbox)) {
ao2_cleanup(endpoint); ao2_cleanup(endpoint);
return NULL; return NULL;
} }
ast_string_field_init_extended(endpoint, incoming_mwi_mailbox);
if (!(endpoint->media.codecs = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) { if (!(endpoint->media.codecs = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) {
ao2_cleanup(endpoint); ao2_cleanup(endpoint);
return NULL; return NULL;