diff options
| author | Scott Griepentrog <sgriepentrog@digium.com> | 2015-03-17 22:15:09 +0000 |
|---|---|---|
| committer | Scott Griepentrog <sgriepentrog@digium.com> | 2015-03-17 22:15:09 +0000 |
| commit | 2c7b9451499c5bd50bc6fa54a0073781b116834c (patch) | |
| tree | 66390386d5b9e4200c83afa3448bd4d054254349 /main/manager.c | |
| parent | 1fb1c81923249413e3e439a645ade8793ccc0db6 (diff) | |
Various: bugfixes found via chaos
Using DEBUG_CHAOS several instances of a null
pointer crash, and one uninitialized variable
were uncovered and fixed. Also added details
on why Asterisk failed to initialize.
Review: https://reviewboard.asterisk.org/r/4468/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433064 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index 545d9f80b..c71f8779f 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3620,7 +3620,10 @@ static enum error_type handle_updates(struct mansession *s, const struct message if (inherit) { while ((tmpl_name = ast_strsep(&inherit, ',', AST_STRSEP_STRIP))) { if ((template = ast_category_get(cfg, tmpl_name, "TEMPLATES=restrict"))) { - ast_category_inherit(category, template); + if (ast_category_inherit(category, template)) { + result = FAILURE_ALLOCATION; + break; + } } else { ast_category_destroy(category); category = NULL; |