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

Fix one more "(null)" string.

Browse Source 
If a hint with no presence portion were added, it would
result in another "(null)" string warning.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8-digiumphones@360071 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2012-03-20 21:29:00 +00:00
parent 8c19a4eeb1
commit a2e1dd220e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/pbx.c
View File

@@ -4361,6 +4361,8 @@ static char *parse_hint_presence(struct ast_str *hint_args)
if ((tmp = strrchr(copy, ','))) {
*tmp = '\0';
tmp++;
} else {
return NULL;
}
ast_str_set(&hint_args, 0, "%s", tmp);
return ast_str_buffer(hint_args);
@@ -4465,6 +4467,11 @@ static int extension_presence_state_helper(struct ast_exten *e, char **subtype,
ast_str_set(&hint_app, 0, "%s", app);
presence_provider = parse_hint_presence(hint_app);
if (ast_strlen_zero(presence_provider)) {
/* No presence string in the hint */
return 0;
}
return ast_presence_state(presence_provider, subtype, message);
}
int ast_hint_presence_state(struct ast_channel *c, const char *context, const char *exten, char **subtype, char **message)