diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-01-09 08:22:30 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-01-09 08:22:30 -0600 |
| commit | 637f6216c40202c60209f4f985433a568e02c9a8 (patch) | |
| tree | 4287bda7a5a948884402276dc576e0655a4b4752 | |
| parent | edbfcfcae18ca3f020eda37eaae3716747f33209 (diff) | |
| parent | 0feca9bc184824e656e59410863650703c26088c (diff) | |
Merge "res_pjsip.c: Fix endpoint identifier registration name search." into 13
| -rw-r--r-- | res/res_pjsip.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 392f9a6f2..842cc20e3 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -2573,13 +2573,13 @@ int ast_sip_register_endpoint_identifier_with_name(struct ast_sip_endpoint_ident id_list_item = ast_calloc(1, sizeof(*id_list_item)); if (!id_list_item) { - ast_log(LOG_ERROR, "Unabled to add endpoint identifier. Out of memory.\n"); + ast_log(LOG_ERROR, "Unable to add endpoint identifier. Out of memory.\n"); return -1; } id_list_item->identifier = identifier; id_list_item->name = name; - ast_debug(1, "Register endpoint identifier %s (%p)\n", name, identifier); + ast_debug(1, "Register endpoint identifier %s(%p)\n", name ?: "", identifier); if (ast_strlen_zero(name)) { /* if an identifier has no name then place in front */ @@ -2602,7 +2602,8 @@ int ast_sip_register_endpoint_identifier_with_name(struct ast_sip_endpoint_ident id_list_item->priority = 0; while ((current = strchr(current, ','))) { ++id_list_item->priority; - if (!strncmp(prev, name, current - prev)) { + if (!strncmp(prev, name, current - prev) + && strlen(name) == current - prev) { break; } prev = ++current; |