github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory/socket leak in UniqueId::ethernetMacAddress()

Browse Source 
Don't jump over `close()`/`free()`
This commit is contained in:
Aleksandr Mezin 2025-05-27 12:42:36 +03:00
parent aab47091b1
commit a17193f7af
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/unique_id.cc
View File

@ -134,7 +134,7 @@ std::string UniqueId::ethernetMacAddress() {
(unsigned char)LLADDR(sdl)[3], (unsigned char)LLADDR(sdl)[3],
(unsigned char)LLADDR(sdl)[4], (unsigned char)LLADDR(sdl)[4],
(unsigned char)LLADDR(sdl)[5]); (unsigned char)LLADDR(sdl)[5]);
goto end; break;
} }
} }
@ -177,7 +177,7 @@ std::string UniqueId::ethernetMacAddress() {
(unsigned char)ifr->ifr_addr.sa_data[4], (unsigned char)ifr->ifr_addr.sa_data[4],
(unsigned char)ifr->ifr_addr.sa_data[5]); (unsigned char)ifr->ifr_addr.sa_data[5]);
goto end; break;
} }
} }
close(sock); close(sock);
@ -219,7 +219,7 @@ std::string UniqueId::ethernetMacAddress() {
(unsigned char)pAdapter->Address[3], (unsigned char)pAdapter->Address[3],
(unsigned char)pAdapter->Address[4], (unsigned char)pAdapter->Address[4],
(unsigned char)pAdapter->Address[5]); (unsigned char)pAdapter->Address[5]);
goto end; break;
} }
pAdapter = pAdapter->Next; pAdapter = pAdapter->Next;
} }
@ -227,9 +227,6 @@ std::string UniqueId::ethernetMacAddress() {
free(pAdapterInfo); free(pAdapterInfo);
#endif #endif
#if defined(__linux__) || defined(__gnu_linux__) || defined(DARWIN) || defined(WIN32)
end:
#endif
return std::string(reinterpret_cast<const char *>(mac)); return std::string(reinterpret_cast<const char *>(mac));
#if defined(__linux__) || defined(__gnu_linux__) || defined(DARWIN) || defined(WIN32) #if defined(__linux__) || defined(__gnu_linux__) || defined(DARWIN) || defined(WIN32)
failed: failed: