From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Wed, 25 Feb 2015 15:00:21 +0000 (+0100)
Subject: fixed bug: dumping packets leaked char array (dump file name) on heap
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=a92bd1ca7678cba6fc8fc1bd356e142d6e0e5afa;p=pingcheck

fixed bug: dumping packets leaked char array (dump file name) on heap
---

diff --git a/src/icmp/icmppacketfactory.cpp b/src/icmp/icmppacketfactory.cpp
index fe422bb..78163ce 100644
--- a/src/icmp/icmppacketfactory.cpp
+++ b/src/icmp/icmppacketfactory.cpp
@@ -25,6 +25,7 @@
 #include <ctime>
 #include <iostream>
 #include <sstream>
+#include <boost/scoped_array.hpp>
 
 #include <logfunc.hpp>
 
@@ -77,8 +78,11 @@ void dump_packet(const std::string &data)
     temp_name << capture_time;
     temp_name << "_XXXXXX.pcap";
     std::string temp_str = temp_name.str();
-    char *secure_filename = strdup(temp_str.c_str());
-    int fd = mkstemps(secure_filename, 5);   // 5 = ".pcap".length
+    std::size_t temp_size = temp_str.size();
+    boost::scoped_array<char> secure_filename( new char[temp_size + 1] );
+    std::copy(temp_str.begin(), temp_str.end(), secure_filename.get());
+    secure_filename[temp_size] = '\0';
+    int fd = mkstemps(secure_filename.get(), 5);   // 5 = ".pcap".length
     if (fd == -1)
     {
         GlobalLogger.warning() << "Failed to create temp file!" << endl;
diff --git a/src/icmp/icmppacketfactory.h b/src/icmp/icmppacketfactory.h
index 60483be..9991c74 100644
--- a/src/icmp/icmppacketfactory.h
+++ b/src/icmp/icmppacketfactory.h
@@ -29,6 +29,9 @@
 
 #include "icmp/icmppacket.h"
 
+
+void dump_packet(const std::string &data);
+
 //-----------------------------------------------------------------------------
 // IcmpPacketFactory
 //-----------------------------------------------------------------------------