[svn-commits] seanbright: branch 1.6.0 r222605 - /branches/1.6.0/main/pbx.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed Oct  7 13:35:02 2009
New Revision: 222605

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=222605
Log:
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

Modified:
    branches/1.6.0/main/pbx.c

Modified: branches/1.6.0/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=222605&r1=222604&r2=222605
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Wed Oct  7 13:35:02 2009
@@ -3208,6 +3208,8 @@
 	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 */