From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 10 Mar 2021 14:51:13 +0000 (+0100)
Subject: CLEANUP: resolvers: Use ha_free() in srvrq_resolution_error_cb()
X-Git-Tag: v2.4-dev12~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c392d461d61f6d9fe59b23ef9c72e00238d73f8e;p=thirdparty%2Fhaproxy.git

CLEANUP: resolvers: Use ha_free() in srvrq_resolution_error_cb()

Two occurrences to "free(A);A=NULL;" may be replaced by a call to ha_free()
in the srvrq_resolution_error_cb() function.
---

diff --git a/src/server.c b/src/server.c
index 809666fae1..ee5bbac380 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3296,12 +3296,10 @@ int srvrq_resolution_error_cb(struct resolv_requester *requester, int error_code
 		if (s->srvrq == srvrq) {
 			resolv_unlink_resolution(s->resolv_requester, 1);
 			srvrq_update_srv_status(s, 1);
-			free(s->hostname);
-			free(s->hostname_dn);
-			s->hostname        = NULL;
-			s->hostname_dn     = NULL;
-			s->hostname_dn_len = 0;
 			memset(&s->addr, 0, sizeof(s->addr));
+			ha_free(&s->hostname);
+			ha_free(&s->hostname_dn);
+			s->hostname_dn_len = 0;
 			s->svc_port = 0;
 		}
 		HA_SPIN_UNLOCK(SERVER_LOCK, &s->lock);