Fix memory leak of lastAclData

diff --git a/src/AccessLogEntry.cc b/src/AccessLogEntry.cc
index 488555d159a1e1fd7003c9db28d77f347bb00542..1bc599c1610e116a8c80100055f64fb903015060 100644 (file)
--- a/src/AccessLogEntry.cc
+++ b/src/AccessLogEntry.cc
@@ -76,7 +76,6 @@ AccessLogEntry::~AccessLogEntry()
     HTTPMSGUNLOCK(adapted_request);
 
     safe_free(lastAclName);
-    safe_free(lastAclData);
 
     HTTPMSGUNLOCK(reply);
     HTTPMSGUNLOCK(request);

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index 044c31089f0315d22d6b70110c0fb765c245d2cd..5968ab2f0f17b97eae8e8b1d768c45e1d344fd0e 100644 (file)
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -42,7 +42,6 @@ public:
     AccessLogEntry() :
         url(nullptr),
         lastAclName(nullptr),
-        lastAclData(nullptr),
         reply(nullptr),
         request(nullptr),
         adapted_request(nullptr)
@@ -207,7 +206,7 @@ public:
 #endif
 
     const char *lastAclName; ///< string for external_acl_type %ACL format code
-    const char *lastAclData; ///< string for external_acl_type %DATA format code
+    SBuf lastAclData; ///< string for external_acl_type %DATA format code
 
     HierarchyLogEntry hier;
     HttpReply *reply;

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 9671129988c90d4dfdae54d566eeb3a651390b39..9326989bcca36f3a50c5635ec4746a8de2e00b56 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -742,7 +742,7 @@ makeExternalAclKey(ACLFilledChecklist * ch, external_acl_data * acl_data)
                 }
             }
 
-            ch->al->lastAclData = xstrdup(sb.c_str());
+            ch->al->lastAclData = sb;
         }
 
 #if USE_IDENT

diff --git a/src/format/Format.cc b/src/format/Format.cc
index bfcc133fb07399e39c65efc11e15c7a9364273f8..c096aa4ee33b322ebdcbb030c98bb50d528ad4a5 100644 (file)
--- a/src/format/Format.cc
+++ b/src/format/Format.cc
@@ -1381,7 +1381,8 @@ Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logS
             break;
 
         case LFT_EXT_ACL_DATA:
-            out = al->lastAclData;
+            if (!al->lastAclData.isEmpty())
+                out = al->lastAclData.c_str();
             break;
         }