From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Thu, 11 May 2023 10:42:24 +0000 (+0200)
Subject: CLEANUP: http_act: use http_free_redirect_rule() to clean redirect act
X-Git-Tag: v2.8-dev12~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd9aff13214d26ddcccc0aef9494f3fbfdb5217b;p=thirdparty%2Fhaproxy.git

CLEANUP: http_act: use http_free_redirect_rule() to clean redirect act

Since redirect rules now have a dedicated cleanup function, better use
it to prevent code duplication.
---

diff --git a/src/http_act.c b/src/http_act.c
index c14ccc6dac..2505ad212d 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -1770,7 +1770,6 @@ static enum act_parse_ret parse_http_del_header(const char **args, int *orig_arg
 /* Release memory allocated by an http redirect action. */
 static void release_http_redir(struct act_rule *rule)
 {
-	struct logformat_node *lf, *lfb;
 	struct redirect_rule *redir;
 
 	redir = rule->arg.redir;
@@ -1778,19 +1777,7 @@ static void release_http_redir(struct act_rule *rule)
 		return;
 
 	LIST_DELETE(&redir->list);
-	if (redir->cond) {
-		prune_acl_cond(redir->cond);
-		free(redir->cond);
-	}
-	free(redir->rdr_str);
-	free(redir->cookie_str);
-	list_for_each_entry_safe(lf, lfb, &redir->rdr_fmt, list) {
-		LIST_DELETE(&lf->list);
-		release_sample_expr(lf->expr);
-		free(lf->arg);
-		free(lf);
-	}
-	free(redir);
+	http_free_redirect_rule(redir);
 }
 
 /* Parse a "redirect" action. It returns ACT_RET_PRS_OK on success,