Don't use ast_strdupa() from within the arguments to a function.

(closes issue #17902)
Reported by: afried
Patches:
      issue_17902.rev1.txt uploaded by russell (license 2)
Tested by: russell

Review: https://reviewboard.asterisk.org/r/927/


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287895 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 12 insertions, 7 deletions

diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index 7036708c7..7fb5f8803 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -151,22 +151,26 @@ int ast_dnsmgr_lookup(const char *name, struct ast_sockaddr *result, struct ast_
  */
 static int dnsmgr_refresh(struct ast_dnsmgr_entry *entry, int verbose)
 {
-	struct ast_sockaddr tmp;
+	struct ast_sockaddr tmp = { .len = 0, };
 	int changed = 0;
 
 	ast_mutex_lock(&entry->lock);
-	if (verbose)
-		ast_verb(3, "refreshing '%s'\n", entry->name);
 
-	memset(&tmp, 0, sizeof(tmp));
+	if (verbose) {
+		ast_verb(3, "refreshing '%s'\n", entry->name);
+	}
 
 	if (!ast_get_ip_or_srv(&tmp, entry->name, entry->service)) {
-		if (!ast_sockaddr_port(&tmp))
+		if (!ast_sockaddr_port(&tmp)) {
 			ast_sockaddr_set_port(&tmp, ast_sockaddr_port(entry->result));
+		}
+
 		if (ast_sockaddr_cmp(&tmp, entry->result)) {
+			const char *old_addr = ast_strdupa(ast_sockaddr_stringify(entry->result));
+			const char *new_addr = ast_strdupa(ast_sockaddr_stringify(&tmp));
+
 			ast_log(LOG_NOTICE, "dnssrv: host '%s' changed from %s to %s\n",
-					entry->name, ast_strdupa(ast_sockaddr_stringify(entry->result)),
-					ast_strdupa(ast_sockaddr_stringify(&tmp)));
+					entry->name, old_addr, new_addr);
 
 			ast_sockaddr_copy(entry->result, &tmp);
 			changed = entry->changed = 1;
@@ -174,6 +178,7 @@ static int dnsmgr_refresh(struct ast_dnsmgr_entry *entry, int verbose)
 	}
 
 	ast_mutex_unlock(&entry->lock);
+
 	return changed;
 }