Address comment

Infomaniak · Dec 3, 2024 · d1d3563 · d1d3563
1 parent 3dea13d
commit d1d3563
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/libcommon/utility/utility.cpp b/src/libcommon/utility/utility.cpp
@@ -880,6 +880,13 @@ void CommonUtility::clearSignalFile(const AppType appType, const SignalCategory
     }
 }
 
+#ifdef _WIN32
+std::string CommonUtility::toUnsafeStr(const SyncName &name) {
+    std::string unsafeName(name.begin(), name.end());
+    return unsafeName;
+}
+#endif
+
 #ifdef __APPLE__
 bool CommonUtility::isLiteSyncExtEnabled() {
     QProcess *process = new QProcess();

diff --git a/src/libcommon/utility/utility.h b/src/libcommon/utility/utility.h
@@ -118,6 +118,11 @@ struct COMMON_EXPORT CommonUtility {
         static void writeSignalFile(AppType appType, SignalType signalType) noexcept;
         static void clearSignalFile(AppType appType, SignalCategory signalCategory, SignalType &signalType) noexcept;
 
+#ifdef _WIN32
+        // Converts a std::wstring to std::string assuming that it contains only mono byte chars
+        static std::string toUnsafeStr(const SyncName &name);
+#endif
+
     private:
         static void extractIntFromStrVersion(const std::string &version, std::vector<int> &tabVersion);
 };

diff --git a/src/libcommongui/logger.cpp b/src/libcommongui/logger.cpp
@@ -54,8 +54,8 @@ static void kdriveLogCatcher(QtMsgType type, const QMessageLogContext &ctx, cons
     }
 #ifdef _WIN32
     // For performance purposes, assume that the file name contains only mono byte chars
-    std::string fileNameStr(fileName.begin(), fileName.end());
-    const char *fileNamePtr = fileNameStr.c_str();
+    std::string unsafeFileName(CommonUtility::toUnsafeStr(fileName));
+    const char *fileNamePtr = unsafeFileName.c_str();
 #else
     const char *fileNamePtr = fileName.c_str();
 #endif