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 /main/config.c | |
| 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 'main/config.c')
| -rw-r--r-- | main/config.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/config.c b/main/config.c index d4429b4ab..a143927af 100644 --- a/main/config.c +++ b/main/config.c @@ -2121,6 +2121,10 @@ int read_config_maps(void) clear_config_maps(); configtmp = ast_config_new(); + if (!configtmp) { + ast_log(LOG_ERROR, "Unable to allocate memory for new config\n"); + return -1; + } configtmp->max_include_level = 1; config = ast_config_internal_load(extconfig_conf, configtmp, flags, "", "extconfig"); if (config == CONFIG_STATUS_FILEINVALID) { |