diff options
| author | Corey Farrell <git@cfware.com> | 2016-08-03 16:39:46 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2016-08-03 16:39:46 -0400 |
| commit | 805f105f8898beb0be0cdf5a7df653fdb03f730e (patch) | |
| tree | 5bba3aa108eae0332e3e74fa62b7adae4c625a2e /main/asterisk.c | |
| parent | 9dc8cfabd5fa240a26972dac5c6ce396dadb7d75 (diff) | |
Add missing checks during startup.
This ensures startup is canceled due to allocation failures from the
following initializations.
* channel.c: ast_channels_init
* config_options.c: aco_init
ASTERISK-26265 #close
Change-Id: I911ed08fa2a3be35de55903e0225957bcdbe9611
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 5f631ee5b..772c3dce9 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -4504,7 +4504,10 @@ static void asterisk_daemon(int isroot, const char *runuser, const char *rungrou exit(1); } - aco_init(); + if (aco_init()) { + printf("Failed: aco_init\n%s", term_quit()); + exit(1); + } if (ast_bucket_init()) { printf("Failed: ast_bucket_init\n%s", term_quit()); @@ -4598,7 +4601,10 @@ static void asterisk_daemon(int isroot, const char *runuser, const char *rungrou exit(1); } - ast_channels_init(); + if (ast_channels_init()) { + printf("Failed: ast_channels_init\n%s", term_quit()); + exit(1); + } if (ast_endpoint_init()) { printf ("Failed: ast_endpoint_init\n%s", term_quit()); |