From: Sean Bright <sean@malleable.com>
Date: Wed, 7 Oct 2009 18:35:02 +0000 (+0000)
Subject: Properly initialize ast_devstate_aggregate so we don't crash sporadically.
X-Git-Tag: 1.6.0.18-rc1~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3b41c917fe89751dec4a2b67498a2711c9ebac0;p=thirdparty%2Fasterisk.git

Properly initialize ast_devstate_aggregate so we don't crash sporadically.

This looks like it was just missed during a merge.

(closes issue #15841)
Reported by: amorsen
Patches:
      ast_devstate_aggregate_init-in-ast_extension_state2.patch uploaded by amorsen (license 676)
Tested by: amorsen

(closes issue #15852)
Reported by: amorsen
Tested by: amorsen, farisraouf


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@222605 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index 9b1388e776..7d30d31cc5 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3208,6 +3208,8 @@ static int ast_extension_state2(struct ast_exten *e)
 	if (!e)
 		return -1;
 
+	ast_devstate_aggregate_init(&agg);
+
 	ast_copy_string(hint, ast_get_extension_app(e), sizeof(hint));
 
 	rest = hint;	/* One or more devices separated with a & character */