diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-05-04 22:17:38 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-05-04 22:17:38 +0000 |
| commit | 781f4657b91d6c8fa3dcf3bc9f0daaad5155506e (patch) | |
| tree | 02eb58c52c581367e9fb47d8de1c633b2b094030 /pbx | |
| parent | 8842f76a7f486cd3d223a2c28ace91fcab5e8a12 (diff) | |
Fix many issues from the NULL_RETURNS Coverity report
Most of the changes here are trivial NULL checks. There are a couple
optimizations to remove the need to check for NULL and outboundproxy parsing
in chan_sip.c was rewritten to avoid use of strtok. Additionally, a bug was
found and fixed with the parsing of outboundproxy when "outboundproxy=," was
set.
(Closes issue ASTERISK-19654)
........
Merged revisions 365398 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 365399 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@365400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_config.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 22ea1d710..6ab54656a 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -733,6 +733,11 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a snprintf(filename, sizeof(filename), "%s%s%s", base, slash, config); cfg = ast_config_load("extensions.conf", config_flags); + if (!cfg) { + ast_cli(a->fd, "Failed to load extensions.conf\n"); + ast_mutex_unlock(&save_dialplan_lock); + return CLI_FAILURE; + } /* try to lock contexts list */ if (ast_rdlock_contexts()) { |