diff options
| author | Corey Farrell <git@cfware.com> | 2015-05-01 14:22:03 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-05-01 14:40:50 -0400 |
| commit | 8f3cee125816486875c7d7d12dcf02dbf2b642d1 (patch) | |
| tree | b6ab63bf0b67c363e6e1435e69ebabaa2b97c153 /main/asterisk.c | |
| parent | 01f3d5b7d4821e9c7fc21982814eb2c137f1d8d9 (diff) | |
Astobj2: Fix initialization order of refdebug and AO2_DEBUG.
This ensures that refdebug is initialized before AO2_DEBUG if
both are enabled, since AO2_DEBUG allocates a container.
This change also makes AO2_DEBUG initialization critical, a
failure will abort Asterisk startup. This is needed since
the failure would be caused by reg_containers allocation
failure, and that would result in a segmentation fault by
ao2_container_register later in startup.
ASTERISK-25048 #close
Reported by: Corey Farrell
Change-Id: I9a243ea3fc5653b48b931ba6d61971cb2e530244
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 86a190bc8..277604bf7 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -4260,7 +4260,10 @@ int main(int argc, char *argv[]) register_config_cli(); read_config_maps(); - astobj2_init(); + if (astobj2_init()) { + printf("Failed: astobj2_init\n%s", term_quit()); + exit(1); + } if (ast_opt_console) { if (el_hist == NULL || el == NULL) |