]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Properly initialize ast_devstate_aggregate so we don't crash sporadically.
authorSean Bright <sean@malleable.com>
Wed, 7 Oct 2009 18:35:02 +0000 (18:35 +0000)
committerSean Bright <sean@malleable.com>
Wed, 7 Oct 2009 18:35:02 +0000 (18:35 +0000)
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

main/pbx.c

index 9b1388e77688370363af2a20d8fa6433ea1b54d3..7d30d31cc5f105f8b538453c64f23f1873b23395 100644 (file)
@@ -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 */