[asterisk-commits] alecdavis: trunk r334618 - in /trunk: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: alecdavis
Date: Wed Sep  7 02:48:25 2011
New Revision: 334618

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334618
Log:
Merged revisions 334617 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334617 | alecdavis | 2011-09-07 19:45:00 +1200 (Wed, 07 Sep 2011) | 17 lines
  
  Merged revisions 334616 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334616 | alecdavis | 2011-09-07 19:33:39 +1200 (Wed, 07 Sep 2011) | 10 lines
    
    Prevent segfault if call arrives before Asterisk is fully booted.
    
    Prevent ast_pbx_start and ast_run_start from starting a new thread unless asterisk
    is fully booted.
     
    alecdavis (license 585)
    Tested by: alecdavis
     
    Review: https://reviewboard.asterisk.org/r/1407/
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=334618&r1=334617&r2=334618
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Sep  7 02:48:25 2011
@@ -5358,6 +5358,11 @@
 		return AST_PBX_FAILED;
 	}
 
+	if (!ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
+		ast_log(LOG_WARNING, "PBX requires Asterisk to be fully booted\n");
+		return AST_PBX_FAILED;
+	}
+
 	if (increase_call_count(c))
 		return AST_PBX_CALL_LIMIT;
 
@@ -5374,6 +5379,11 @@
 enum ast_pbx_result ast_pbx_run_args(struct ast_channel *c, struct ast_pbx_args *args)
 {
 	enum ast_pbx_result res = AST_PBX_SUCCESS;
+
+	if (!ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
+		ast_log(LOG_WARNING, "PBX requires Asterisk to be fully booted\n");
+		return AST_PBX_FAILED;
+	}
 
 	if (increase_call_count(c)) {
 		return AST_PBX_CALL_LIMIT;