fix security check issues

stefankueng · Nov 13, 2024 · 64015b0 · 64015b0
1 parent d0a85ad
commit 64015b0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/Commands/CmdFindReplace.cpp b/src/Commands/CmdFindReplace.cpp
@@ -2123,7 +2123,7 @@ void CFindReplaceDlg::SearchThread(int id, const std::wstring& searchPath, const
                 size_t resultSizeBefore = m_pendingSearchResults.size();
                 SearchDocument(*searchWnd.get(), DocID(), doc, searchFor, flags, exSearchFlags,
                                m_pendingSearchResults, m_pendingFoundPaths);
-                if (m_pendingSearchResults.size() - resultSizeBefore > 0)
+                if (m_pendingSearchResults.size() - resultSizeBefore != 0)
                     m_pendingFoundPaths.push_back(std::move(path));
                 NewData(timeOfLastProgressUpdate, false);
                 if (m_foundSize >= m_maxSearchResults)

diff --git a/src/Commands/CmdSession.cpp b/src/Commands/CmdSession.cpp
@@ -119,7 +119,7 @@ void CCmdSessionLoad::OnClose()
             settings.SetInt64(sessionSection(), CStringUtils::Format(L"undocurrentaction%d", index).c_str(), pos.m_undoData.m_currentAction);
             settings.SetInt64(sessionSection(), CStringUtils::Format(L"undosavepoint%d", index).c_str(), pos.m_undoData.m_savePoint);
             settings.SetInt64(sessionSection(), CStringUtils::Format(L"undotentative%d", index).c_str(), pos.m_undoData.m_tentative);
-            for (size_t undoIdx = 0; undoIdx < pos.m_undoData.m_actions.size(); ++undoIdx)
+            for (int undoIdx = 0; undoIdx < static_cast<int>(pos.m_undoData.m_actions.size()); ++undoIdx)
             {
                 auto& action = pos.m_undoData.m_actions[undoIdx];
                 settings.SetInt64(sessionSection(), CStringUtils::Format(L"undoactiontype%d_%d", index, undoIdx).c_str(), action.m_type);
@@ -301,14 +301,14 @@ void CCmdSessionLoad::RestoreSavedSession() const
         {
             stringtok(pos.m_lineStateVector, folds, true, L";", false);
         }
-        auto numUndoActions = static_cast<size_t>(settings.GetInt64(sessionSection(), CStringUtils::Format(L"undonumactions%d", fileNum).c_str(), 0));
+        auto numUndoActions = static_cast<int>(settings.GetInt64(sessionSection(), CStringUtils::Format(L"undonumactions%d", fileNum).c_str(), 0));
         if (numUndoActions)
         {
             CUndoData undoData;
             undoData.m_currentAction = static_cast<int>(settings.GetInt64(sessionSection(), CStringUtils::Format(L"undocurrentaction%d", fileNum).c_str(), 0));
             undoData.m_savePoint     = static_cast<int>(settings.GetInt64(sessionSection(), CStringUtils::Format(L"undosavepoint%d", fileNum).c_str(), 0));
             undoData.m_tentative     = static_cast<int>(settings.GetInt64(sessionSection(), CStringUtils::Format(L"undotentative%d", fileNum).c_str(), 0));
-            for (size_t undoIdx = 0; undoIdx < numUndoActions; ++undoIdx)
+            for (int undoIdx = 0; undoIdx < numUndoActions; ++undoIdx)
             {
                 CUndoAction action;
                 action.m_type     = static_cast<int>(settings.GetInt64(sessionSection(), CStringUtils::Format(L"undoactiontype%d_%d", fileNum, undoIdx).c_str(), 0));

diff --git a/src/SettingsDlg.cpp b/src/SettingsDlg.cpp
@@ -1,6 +1,6 @@
 // This file is part of BowPad.
 //
-// Copyright (C) 2021-2022 - Stefan Kueng
+// Copyright (C) 2021-2022, 2024 - Stefan Kueng
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -274,7 +274,8 @@ void CSettingsDlg::InitSettingsList()
             case SettingType::Number:
             {
                 auto val = CIniSettings::Instance().GetInt64(setting.section.c_str(), setting.key.c_str(), setting.def.l);
-                ListView_SetItemText(hListControl, index, 0, const_cast<LPWSTR>(std::to_wstring(val).c_str()));
+                auto valStr = std::to_wstring(val);
+                ListView_SetItemText(hListControl, index, 0, const_cast<LPWSTR>(valStr.c_str()));
             }
             break;
             case SettingType::String: