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

Fix race condition in UniqueId::uniqueId()

Browse Source
This commit is contained in:
Wenfeng Liu 2018-05-25 09:10:23 +00:00 committed by Felipe Zimmerle
parent b586fa9c1a
commit b85a645610
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/unique_id.cc
View File

@ -55,6 +55,8 @@
namespace modsecurity { namespace modsecurity {
std::once_flag UniqueId::onceFlag;
void UniqueId::fillUniqueId() { void UniqueId::fillUniqueId() {
std::string macAddress; std::string macAddress;
std::string name; std::string name;

7
src/unique_id.h
View File

@ -15,6 +15,7 @@
#ifdef __cplusplus #ifdef __cplusplus
#include <string> #include <string>
#include <mutex>
#endif #endif
#ifndef SRC_UNIQUE_ID_H_ #ifndef SRC_UNIQUE_ID_H_
@ -37,9 +38,9 @@ class UniqueId {
} }
static std::string uniqueId() { static std::string uniqueId() {
if (UniqueId::getInstance().uniqueId_str.empty()) { std::call_once(UniqueId::onceFlag,[]() {
UniqueId::getInstance().fillUniqueId(); UniqueId::getInstance().fillUniqueId();
} });
return UniqueId::getInstance().uniqueId_str; return UniqueId::getInstance().uniqueId_str;
} }
@ -59,6 +60,8 @@ class UniqueId {
// C++ 11 // C++ 11
// UniqueId(UniqueId const&) = delete; // UniqueId(UniqueId const&) = delete;
// void operator=(UniqueId const&) = delete; // void operator=(UniqueId const&) = delete;
static std::once_flag onceFlag;
}; };
} // namespace modsecurity } // namespace modsecurity