mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-11-16 00:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix registry key handle leak in win_eventlog_sink::add_registry_info

Browse Source
This commit is contained in:
bandana2004 2020-02-09 18:04:38 +02:00
parent 4bece787c8
commit 2435f46d06
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/spdlog/sinks/win_eventlog_sink.h
View File

@ -306,13 +306,23 @@ public:
event_id_ = event_id; event_id_ = event_id;
std::string subkey = fmt::format("SYSTEM\\CurrentControlSet\\Services\\EventLog\\{}\\{}", log, source_); std::string logSourceRegKeyName = fmt::format("SYSTEM\\CurrentControlSet\\Services\\EventLog\\{}\\{}", log, source_);
struct hkey_t
{
::HKEY handle_ {};
~hkey_t()
{
if (handle_)
RegCloseKey(handle_);
}
} logSourceRegKey;
::HKEY hkey {};
DWORD disposition {}; DWORD disposition {};
long stat = RegCreateKeyEx(HKEY_LOCAL_MACHINE, subkey.c_str(), 0, NULL, long stat = RegCreateKeyEx(HKEY_LOCAL_MACHINE, logSourceRegKeyName.c_str(), 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL,
&hkey, &disposition); &logSourceRegKey.handle_, &disposition);
if (stat == ERROR_SUCCESS) if (stat == ERROR_SUCCESS)
{ {
if (disposition == REG_CREATED_NEW_KEY && !message_file_path.empty()) if (disposition == REG_CREATED_NEW_KEY && !message_file_path.empty())
@ -324,12 +334,12 @@ public:
std::vector<char>expanded_message_file_path(expanded_message_file_path_length); std::vector<char>expanded_message_file_path(expanded_message_file_path_length);
ExpandEnvironmentStrings(message_file_path.c_str(), expanded_message_file_path.data(), expanded_message_file_path_length); // this can't fail if the preivous ExpandEnvironmentStrings succeeded ExpandEnvironmentStrings(message_file_path.c_str(), expanded_message_file_path.data(), expanded_message_file_path_length); // this can't fail if the preivous ExpandEnvironmentStrings succeeded
stat = RegSetValueEx(hkey, "EventMessageFile", 0, REG_SZ, (LPBYTE) expanded_message_file_path.data(), expanded_message_file_path_length); stat = RegSetValueEx(logSourceRegKey.handle_, "EventMessageFile", 0, REG_SZ, (LPBYTE) expanded_message_file_path.data(), expanded_message_file_path_length);
if (stat != ERROR_SUCCESS) if (stat != ERROR_SUCCESS)
SPDLOG_THROW(win32_error("RegSetValueEx", stat)); SPDLOG_THROW(win32_error("RegSetValueEx", stat));
DWORD typesSupported = 7; DWORD typesSupported = 7;
stat = RegSetValueEx(hkey, "TypesSupported", 0, REG_DWORD, (LPBYTE) &typesSupported, sizeof(DWORD)); stat = RegSetValueEx(logSourceRegKey.handle_, "TypesSupported", 0, REG_DWORD, (LPBYTE) &typesSupported, sizeof(DWORD));
if (stat != ERROR_SUCCESS) if (stat != ERROR_SUCCESS)
SPDLOG_THROW(win32_error("RegSetValueEx", stat)); SPDLOG_THROW(win32_error("RegSetValueEx", stat));
} }
@ -338,8 +348,6 @@ public:
{ {
SPDLOG_THROW(win32_error("RegCreateKeyEx", stat)); SPDLOG_THROW(win32_error("RegCreateKeyEx", stat));
} }
RegCloseKey(hkey);
} }
}; };