infosecn1nja
/
C3
mirror of https://github.com/infosecn1nja/C3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'NullptrStringView' into 'master' 

Fix gateway crash on nullptr std::string_view

See merge request C3/C3!173
dependabot/npm_and_yarn/Src/WebController/UI/websocket-extensions-0.1.4
Grzegorz Rychlik 2020-03-12 07:57:17 +00:00
parent 148f62a03d 37e357fc21
commit a54ba7cf76
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Core/BackendCommons.cpp
View File

@ -97,7 +97,7 @@ std::shared_ptr<FSecure::C3::Relay> FSecure::C3::Utils::CreateGatewayFromConfigu
throw std::runtime_error{ OBF("Could not find process image path.") }; throw std::runtime_error{ OBF("Could not find process image path.") };
// Read both input files. // Read both input files.
callbackOnLog({ OBF("Reading input files..."), LogMessage::Severity::Information }, nullptr); callbackOnLog({ OBF("Reading input files..."), LogMessage::Severity::Information }, "");
auto [apiBridgeIp, apiBrigdePort, buildId, agentId, name] = ReadGatewayConfigurationFile(std::filesystem::path{ executableFilePath }.remove_filename() / configurationFileName); auto [apiBridgeIp, apiBrigdePort, buildId, agentId, name] = ReadGatewayConfigurationFile(std::filesystem::path{ executableFilePath }.remove_filename() / configurationFileName);
auto [wereKeysReadOrGenerated, signatures, broadcastKey] = ReadFromFileOrGenerateGatewayKeys(std::filesystem::path{ executableFilePath }.remove_filename() / keysFileName); auto [wereKeysReadOrGenerated, signatures, broadcastKey] = ReadFromFileOrGenerateGatewayKeys(std::filesystem::path{ executableFilePath }.remove_filename() / keysFileName);
@ -107,7 +107,7 @@ std::shared_ptr<FSecure::C3::Relay> FSecure::C3::Utils::CreateGatewayFromConfigu
if (!wereKeysReadOrGenerated) if (!wereKeysReadOrGenerated)
callbackOnLog({ OBF("Generated new keys/signatures and stored them on disk."), LogMessage::Severity::Information }, ""); callbackOnLog({ OBF("Generated new keys/signatures and stored them on disk."), LogMessage::Severity::Information }, "");
callbackOnLog({ OBF("Starting Gateway..."), LogMessage::Severity::Information }, nullptr); callbackOnLog({ OBF("Starting Gateway..."), LogMessage::Severity::Information }, "");
return FSecure::C3::Core::GateRelay::CreateAndRun(callbackOnLog, interfaceFactory, apiBridgeIp, apiBrigdePort, signatures, broadcastKey, buildId, snapshotPath, agentId, name); return FSecure::C3::Core::GateRelay::CreateAndRun(callbackOnLog, interfaceFactory, apiBridgeIp, apiBrigdePort, signatures, broadcastKey, buildId, snapshotPath, agentId, name);
} }