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

res_pjsip: Strip spaces from items parsed from comma-separated lists

Browse Source 
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(&copy, ",") 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
This commit is contained in:
George Joseph
2016-03-06 13:38:41 -07:00
parent 6e58f83d8d
commit 530cff5f5f
12 changed files with 71 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/asterisk/strings.h
View File

@@ -145,8 +145,12 @@ static int force_inline attribute_pure ast_ends_with(const char *str, const char
AST_INLINE_API(
char * attribute_pure ast_skip_blanks(const char *str),
{
while (*str && ((unsigned char) *str) < 33)
str++;
if (str) {
while (*str && ((unsigned char) *str) < 33) {
str++;
}
}
return (char *) str;
}
)
@@ -184,8 +188,12 @@ char *ast_trim_blanks(char *str),
AST_INLINE_API(
char * attribute_pure ast_skip_nonblanks(const char *str),
{
while (*str && ((unsigned char) *str) > 32)
str++;
if (str) {
while (*str && ((unsigned char) *str) > 32) {
str++;
}
}
return (char *) str;
}
)