aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2009-10-07 18:35:02 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2009-10-07 18:35:02 +0000
commita18eac8e72b5b8e3a58152dbfe2a9584bdb7a79b (patch)
tree02b0445c779dc6c9533b4f15e21300852d24e369
parent3a8decdda43a0b64b77375b39e9d6add7f587341 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@222605 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/pbx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 9b1388e77..7d30d31cc 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 */