From cee432c9d8fdb70971e3f70f4899706dfb55ea95 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 8 Nov 2011 18:02:51 +0000 Subject: 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 --- main/acl.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'main/acl.c') 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; } -- cgit v1.2.3