From 530cff5f5f3be4d2f53e84a656f10f2f43638d1c Mon Sep 17 00:00:00 2001 From: George Joseph Date: Sun, 6 Mar 2016 13:38:41 -0700 Subject: res_pjsip: Strip spaces from items parsed from comma-separated lists Configurations like "aors = a, b, c" were either ignoring everything after "a" or trying to look up " b". Same for mailboxes, ciphers, contacts and a few others. To fix, all the strsep(©, ",") calls have been wrapped in ast_strip. To facilitate this, ast_strip, ast_skip_blanks and ast_skip_nonblanks were updated to handle null pointers. In some cases, an ast_strlen_zero() test was added to skip consecutive commas. There was also an attempt to ast_free an ast_strdupa'd string in ast_sip_for_each_aor which was causing a SEGV. I removed it. Although this issue was reported for realtime, the issue was in the res_pjsip modules so all config mechanisms were affected. ASTERISK-25829 #close Reported-by: Mateusz Kowalski Change-Id: I0b22a2cf22a7c1c50d4ecacbfa540155bec0e7a2 --- res/res_pjsip_path.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'res/res_pjsip_path.c') diff --git a/res/res_pjsip_path.c b/res/res_pjsip_path.c index d0ee5a49a..47d6a7906 100644 --- a/res/res_pjsip_path.c +++ b/res/res_pjsip_path.c @@ -53,9 +53,13 @@ static struct ast_sip_aor *find_aor(struct ast_sip_endpoint *endpoint, pjsip_uri configured_aors = ast_strdupa(endpoint->aors); /* Iterate the configured AORs to see if the user or the user+domain match */ - while ((aor_name = strsep(&configured_aors, ","))) { + while ((aor_name = ast_strip(strsep(&configured_aors, ",")))) { struct ast_sip_domain_alias *alias = NULL; + if (ast_strlen_zero(aor_name)) { + continue; + } + if (!pj_strcmp2(&sip_uri->user, aor_name)) { break; } -- cgit v1.2.3