diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-11-08 18:02:51 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-11-08 18:02:51 +0000 |
| commit | cee432c9d8fdb70971e3f70f4899706dfb55ea95 (patch) | |
| tree | d50ed6d0493adb84e4458c5c01713322fb513064 /main/acl.c | |
| parent | a46f6d142c34c957df541f01afb527355e57faaf (diff) | |
Fixed reference to incorrect variable if unknown host configured crash.
* Fixed a LOG_ERROR message referencing the config variable list v that
had previously been processed and became NULL.
* Added error return value set that was missing in an ast_append_ha()
error return path.
(closes issue ASTERISK-18743)
Reported by: Michele
Patches:
issueA18743-fix_dynamic_exclude_static_bad_host_log.patch (license #5674) patch uploaded by Walter Doekes
Tested by: Michele
........
Merged revisions 343851 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 343852 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@343853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/acl.c')
| -rw-r--r-- | main/acl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/acl.c b/main/acl.c index f3795c95a..69713bbd8 100644 --- a/main/acl.c +++ b/main/acl.c @@ -408,6 +408,9 @@ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha } if (!(ha = ast_calloc(1, sizeof(*ha)))) { + if (error) { + *error = 1; + } return ret; } |