From: Ivan Poddubny <ivan.poddubny@gmail.com>
Date: Wed, 7 Oct 2015 06:24:31 +0000 (+0300)
Subject: func_presencestate: Return "not_set" when no data is set in AstDB
X-Git-Tag: 11.21.0-rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F1410%2F1;p=thirdparty%2Fasterisk.git

func_presencestate: Return "not_set" when no data is set in AstDB

Return AST_PRESENCE_NOT_SET when CustomPresence AstDB key does not
exist, i.e. when a new CustomPresence is added in the dialplan.

ASTERISK-25400 #close
Reported by: Andrew Nagy

Change-Id: I6fb17b16591b5a55fbffe96f3994ec26b1b1723a
---

diff --git a/funcs/func_presencestate.c b/funcs/func_presencestate.c
index d57b8e30cb..e37e8c60d3 100644
--- a/funcs/func_presencestate.c
+++ b/funcs/func_presencestate.c
@@ -243,7 +243,9 @@ static enum ast_presence_state custom_presence_callback(const char *data, char *
 	char *_message;
 	char *_subtype;
 
-	ast_db_get(astdb_family, data, buf, sizeof(buf));
+	if (ast_db_get(astdb_family, data, buf, sizeof(buf))) {
+		return AST_PRESENCE_NOT_SET;
+	}
 
 	if (parse_data(buf, &state, &_subtype, &_message, &_options)) {
 		return AST_PRESENCE_INVALID;