summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-09-22 10:06:37 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-09-22 10:06:37 -0500
commitd4422a2253b02e3b5a14a1d68afb1612a0e37725 (patch)
tree5b7120fe5e4e15c26aeedf4861597dba43d9c055 /main
parent94b655ab051ed5e969eca8e31cb69fd0abb38e6a (diff)
parent64df75b02c95b15eabf8abde9a819a8a3e5b25d4 (diff)
Merge "core: Ensure presencestate subtype and message are NULL." into 14
Diffstat (limited to 'main')
-rw-r--r--main/presencestate.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/presencestate.c b/main/presencestate.c
index 3be2ebeed..c0a0ebdc1 100644
--- a/main/presencestate.c
+++ b/main/presencestate.c
@@ -161,6 +161,9 @@ static enum ast_presence_state ast_presence_state_helper(const char *presence_pr
[AST_PRESENCE_DND] = 7
};
+ *subtype = NULL;
+ *message = NULL;
+
while ((label = strsep(&labels, "&"))) {
enum ast_presence_state next_state = AST_PRESENCE_INVALID;
char *next_subtype = NULL;