generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 11:31:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2919 from KevDi/bugfix/setFailureActionsCrashes

Browse Source 
Fixed Crash in WinService::setFailureActions
This commit is contained in:
Günter Obiltschnig
2020-02-12 20:35:44 +01:00
committed by GitHub
parent 29f745ff65 e51adf72cf
commit c4841302b4
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Util/src/WinService.cpp
View File

@@ -236,9 +236,16 @@ WinService::Startup WinService::getStartup() const
void WinService::setFailureActions(FailureActionVector failureActions, const std::string& command, const std::string& rebootMessage) void WinService::setFailureActions(FailureActionVector failureActions, const std::string& command, const std::string& rebootMessage)
{ {
if (failureActions.size() > 3) {
throw InvalidArgumentException{ "Only 0-3 Failure Actions are supported" };
}
open(); open();
auto actions = new SC_ACTION[3]; auto actions = new SC_ACTION[failureActions.size()];
SERVICE_FAILURE_ACTIONSW ac; SERVICE_FAILURE_ACTIONSW ac;
ac.lpCommand = NULL;
ac.lpRebootMsg = NULL;
std::wstring urebootMessage; std::wstring urebootMessage;
Poco::UnicodeConverter::toUTF16(rebootMessage, urebootMessage); Poco::UnicodeConverter::toUTF16(rebootMessage, urebootMessage);
@@ -250,7 +257,7 @@ void WinService::setFailureActions(FailureActionVector failureActions, const std
std::vector<wchar_t> commandVector{ uComamnd.begin(), uComamnd.end() }; std::vector<wchar_t> commandVector{ uComamnd.begin(), uComamnd.end() };
commandVector.push_back('\0'); commandVector.push_back('\0');
for (auto i = 0; i < 3; i++) for (auto i = 0; i < failureActions.size(); i++)
{ {
switch (failureActions[i].type) switch (failureActions[i].type)
{ {
@@ -276,7 +283,7 @@ void WinService::setFailureActions(FailureActionVector failureActions, const std
} }
ac.dwResetPeriod = 0; ac.dwResetPeriod = 0;
ac.cActions = 3; ac.cActions = failureActions.size();
ac.lpsaActions = actions; ac.lpsaActions = actions;
if (!ChangeServiceConfig2W(_svcHandle, SERVICE_CONFIG_FAILURE_ACTIONS, &ac)) if (!ChangeServiceConfig2W(_svcHandle, SERVICE_CONFIG_FAILURE_ACTIONS, &ac))