diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-07-14 14:24:06 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-07-15 13:45:25 +0200 |
| commit | 307ca91be74be6083ae195974e1a4e3f78a0ec33 (patch) | |
| tree | 91a9bd70fbab9b2e206d42016efd6293a3704e57 | |
| parent | be6324ca93855e371c380b4313c849d879306682 (diff) | |
| download | mullvadvpn-307ca91be74be6083ae195974e1a4e3f78a0ec33.tar.xz mullvadvpn-307ca91be74be6083ae195974e1a4e3f78a0ec33.zip | |
Add null check for logger to WinFw deinitialize function
| -rw-r--r-- | windows/winfw/src/winfw/winfw.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/windows/winfw/src/winfw/winfw.cpp b/windows/winfw/src/winfw/winfw.cpp index cd90befead..7a6a17aec8 100644 --- a/windows/winfw/src/winfw/winfw.cpp +++ b/windows/winfw/src/winfw/winfw.cpp @@ -168,9 +168,10 @@ WinFw_Deinitialize(WINFW_CLEANUP_POLICY cleanupPolicy) delete g_fwContext; g_fwContext = nullptr; - std::stringstream ss; - ss << "Deinitializing WinFw"; - g_logSink(MULLVAD_LOG_LEVEL_WARNING, ss.str().c_str(), g_logSinkContext); + if (nullptr != g_logSink) + { + g_logSink(MULLVAD_LOG_LEVEL_DEBUG, "Deinitializing WinFw", g_logSinkContext); + } // // Continue blocking with persistent rules if this is what the caller requested @@ -186,9 +187,10 @@ WinFw_Deinitialize(WINFW_CLEANUP_POLICY cleanupPolicy) rules::persistent::BlockAll blockAll; - std::stringstream ss; - ss << "Adding persistent block rules"; - g_logSink(MULLVAD_LOG_LEVEL_WARNING, ss.str().c_str(), g_logSinkContext); + if (nullptr != g_logSink) + { + g_logSink(MULLVAD_LOG_LEVEL_DEBUG, "Adding persistent block rules", g_logSinkContext); + } return sessionController->executeTransaction([&](SessionController &controller, wfp::FilterEngine &engine) { @@ -227,9 +229,10 @@ WinFw_Deinitialize(WINFW_CLEANUP_POLICY cleanupPolicy) rules::baseline::BlockAll blockAll; - std::stringstream ss; - ss << "Adding ephemeral block rules"; - g_logSink(MULLVAD_LOG_LEVEL_WARNING, ss.str().c_str(), g_logSinkContext); + if (nullptr != g_logSink) + { + g_logSink(MULLVAD_LOG_LEVEL_DEBUG, "Adding ephemeral block rules", g_logSinkContext); + } return sessionController->executeTransaction([&](SessionController &controller, wfp::FilterEngine &engine) { |