Merge pull request #3222 from eduar-hte/remove-copies

Remove several string copies and unnecessary heap allocations

Author: airween

src/Makefile.am

@@ -253,7 +253,6 @@ UTILS = \
 	utils/random.cc \
 	utils/regex.cc \
 	utils/sha1.cc \
-	utils/string.cc \
 	utils/system.cc \
 	utils/shared_files.cc
 

src/request_body_processor/multipart.cc

@@ -70,22 +70,20 @@ void MultipartPartTmpFile::Open() {
 
     localtime_r(&tt, &timeinfo);
 
-    char tstr[300] {};
-    strftime(tstr, 299, "/%Y%m%d-%H%M%S", &timeinfo);
+    char tstr[17];
+    strftime(tstr, std::size(tstr), "/%Y%m%d-%H%M%S", &timeinfo);
 
     std::string path = m_transaction->m_rules->m_uploadDirectory.m_value;
     path = path + tstr + "-" + *m_transaction->m_id.get();
     path += "-file-XXXXXX";
 
-    char* tmp = strdup(path.c_str());
 #ifndef WIN32
-    m_tmp_file_fd = mkstemp(tmp);
+    m_tmp_file_fd = mkstemp(path.data());
 #else
-    _mktemp_s(tmp, path.length()+1);
-    m_tmp_file_fd = _open(tmp, _O_CREAT | _O_EXCL | _O_RDWR);
+    _mktemp_s(path.data(), path.length()+1);
+    m_tmp_file_fd = _open(path.c_str(), _O_CREAT | _O_EXCL | _O_RDWR);
 #endif
-    m_tmp_file_name.assign(tmp);
-    free(tmp);
+    m_tmp_file_name = path;
     ms_dbg_a(m_transaction, 4, "MultipartPartTmpFile: Create filename= " + m_tmp_file_name);
 
     int mode = m_transaction->m_rules->m_uploadFileMode.m_value;
@@ -857,7 +855,7 @@ int Multipart::process_part_header(std::string *error, int offset) {
             }
 
             new_value = std::string(data);
-            utils::string::chomp(&new_value);
+            utils::string::chomp(new_value);
 
             /* update the header value in the table */
             header_value = m_mpp->m_headers.at(
@@ -926,7 +924,7 @@ int Multipart::process_part_header(std::string *error, int offset) {
                 i++;
             }
             header_value = std::string(data);
-            utils::string::chomp(&header_value);
+            utils::string::chomp(header_value);
 
             /* error if the name already exists */
             if (m_mpp->m_headers.count(header_name) > 0) {
@@ -1271,22 +1269,10 @@ int Multipart::multipart_complete(std::string *error) {
 
 
 int Multipart::count_boundary_params(const std::string& str_header_value) {
-    std::string lower = utils::string::tolower(str_header_value);
-    const char *header_value = lower.c_str();
-    char *duplicate = NULL;
-    char *s = NULL;
     int count = 0;
 
-    if (header_value == NULL) {
-        return -1;
-    }
-
-    duplicate = strdup(header_value);
-    if (duplicate == NULL) {
-        return -1;
-    }
-
-    s = duplicate;
+    const auto lower = utils::string::tolower(str_header_value);
+    const char *s = lower.c_str();
     while ((s = strstr(s, "boundary")) != NULL) {
         s += 8;
 
@@ -1295,7 +1281,6 @@ int Multipart::count_boundary_params(const std::string& str_header_value) {
         }
     }
 
-    free(duplicate);
     return count;
 }
 

src/transaction.cc

@@ -1520,7 +1520,7 @@ std::string Transaction::toOldAuditLogFormatIndex(const std::string &filename,
     ss << utils::string::dash_if_empty(
        m_variableRequestHeaders.resolveFirst("Host").get())
         << " ";
-    ss << utils::string::dash_if_empty(this->m_clientIpAddress->c_str()) << " ";
+    ss << utils::string::dash_if_empty(this->m_clientIpAddress.get()) << " ";
     /** TODO: Check variable */
     variables::RemoteUser *r = new variables::RemoteUser("REMOTE_USER");
     std::vector<const VariableValue *> l;
@@ -1531,7 +1531,7 @@ std::string Transaction::toOldAuditLogFormatIndex(const std::string &filename,
     delete r;
 
     ss << utils::string::dash_if_empty(
-        m_variableRemoteUser.c_str());
+        &m_variableRemoteUser);
     ss << " ";
     /** TODO: Check variable */
     //ss << utils::string::dash_if_empty(