Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixing memory leak triggered by new MAC address logging.

Browse source
This commit is contained in:
Robin Sommer 2016-06-07 11:45:26 -07:00
parent b2371752e4
commit 351014f48a
5 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/net_util.cc
View file

@ -148,9 +148,9 @@ const char* fmt_conn_id(const uint32* src_addr, uint32 src_port,
return fmt_conn_id(src, src_port, dst, dst_port);
}
char* fmt_mac(const unsigned char* m, int len)
std::string fmt_mac(const unsigned char* m, int len)
{
char* buf = new char[25];
static char buf[25];
if ( len < 8 && len != 6 )
{
@ -159,10 +159,10 @@ char* fmt_mac(const unsigned char* m, int len)
}
if ( (len == 6) || (m[6] == 0 && m[7] == 0) ) // EUI-48
snprintf(buf, 19, "%02x:%02x:%02x:%02x:%02x:%02x",
snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x",
m[0], m[1], m[2], m[3], m[4], m[5]);
else
snprintf(buf, 25, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
m[0], m[1], m[2], m[3], m[4], m[5], m[6], m[7]);
return buf;