From d63e58203a796bb59e20b51cb705254100621c9a Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 8 Nov 2011 17:58:21 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@343851 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 8 ++++---- main/acl.c | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index de963f3a63..33638bf541 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -27360,11 +27360,11 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str ast_string_field_set(peer, tohost, srvlookup); if (global_dynamic_exclude_static) { - int err = 0; + int ha_error = 0; sip_cfg.contact_ha = ast_append_ha("deny", ast_sockaddr_stringify_addr(&peer->addr), - sip_cfg.contact_ha, &err); - if (err) { - ast_log(LOG_ERROR, "Bad ACL entry in configuration line %d : %s\n", v->lineno, v->value); + sip_cfg.contact_ha, &ha_error); + if (ha_error) { + ast_log(LOG_ERROR, "Bad or unresolved host/IP entry in configuration for peer %s, cannot add to contact ACL\n", peer->name); } } } else if (peer->dnsmgr && !peer->host_dynamic) { diff --git a/main/acl.c b/main/acl.c index a7b283ed97..961b501368 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; }