sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

utils: Make behavior of ast_strsep* match strsep. 

Given the scenario of passing an empty string to the
ast_strsep functions the functions would return NULL
instead of an empty string. This is counter to how
strsep itself works.

This change alters the behavior of the functions to
match that of strsep.

Fixes: #565
This commit is contained in:
Joshua C. Colp 2024-01-31 10:03:28 -04:00 committed by asterisk-org-access-app[bot]
parent d7583f12b6
commit edf54951be
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/asterisk/strings.h
View File

@ -271,7 +271,7 @@ enum ast_strsep_flags {
AST_STRSEP_UNESCAPE unescapes '\' sequences.
AST_STRSEP_ALL does all of the above processing.
\return The next token or NULL if done or if there are more than 8 levels of
nested quotes.
nested quotes. If provided an empty string, will return the empty string.
This function acts like strsep with three exceptions...
The separator is a single character instead of a string.
@ -323,7 +323,7 @@ char *ast_strsep(char **s, const char sep, uint32_t flags);
AST_STRSEP_UNESCAPE unescapes '\' sequences.
AST_STRSEP_ALL does all of the above processing.
\return The next token or NULL if done or if there are more than 8 levels of
nested quotes.
nested quotes. If provided an empty string, will return the empty string.
*/
char *ast_strsep_quoted(char **s, const char sep, const char quote, uint32_t flags);

6
main/utils.c
View File

@ -1841,7 +1841,8 @@ char *ast_strsep(char **iss, const char sep, uint32_t flags)
char stack[8];
if (ast_strlen_zero(st)) {
return NULL;
*iss = NULL;
return st;
}
memset(stack, 0, sizeof(stack));
@ -1905,7 +1906,8 @@ char *ast_strsep_quoted(char **iss, const char sep, const char quote, uint32_t f
const char qstr[] = { quote };
if (ast_strlen_zero(st)) {
return NULL;
*iss = NULL;
return st;
}
memset(stack, 0, sizeof(stack));