From cfb96b0a775a34a2288cad975937b5c536515686 Mon Sep 17 00:00:00 2001
From: z3APA3A <3APA3A@3proxy.ru>
Date: Tue, 3 Nov 2020 13:31:57 +0300
Subject: [PATCH] resolve conflicts

---
 src/proxymain.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/proxymain.c b/src/proxymain.c
index b1ee3f6..80e21ca 100644
--- a/src/proxymain.c
+++ b/src/proxymain.c
@@ -1145,7 +1145,10 @@ ERRORDSTNAMES:
 ERRORCHAINS:
 	ac->next = NULL;
 ERRORNEXT:
-	freeacl(ret);
+	freeacl(srv->preacl);
+	srv->preacl = NULL;
+	freeacl(srv->acl);
+	srv->acl = NULL;
 	return 21;
 
 }