From f52c2b022d4906703e20c06a6b2018c960946792 Mon Sep 17 00:00:00 2001 From: Christian Grasser Date: Sun, 14 Nov 2021 19:55:53 +0100 Subject: [PATCH] Fix crash in regex search Avoid unhandled std::range_error exceptions in case of an text input issue by providing an user-supplied byte-error string see https://en.cppreference.com/w/cpp/locale/wstring_convert/from_bytes and https://en.cppreference.com/w/cpp/locale/wstring_convert/to_bytes Fix #10773, close #10783 --- PowerEditor/src/MISC/Common/Common.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PowerEditor/src/MISC/Common/Common.cpp b/PowerEditor/src/MISC/Common/Common.cpp index 4358b286f..8c72b6472 100644 --- a/PowerEditor/src/MISC/Common/Common.cpp +++ b/PowerEditor/src/MISC/Common/Common.cpp @@ -1223,7 +1223,7 @@ bool isAssoCommandExisting(LPCTSTR FullPathName) std::wstring s2ws(const std::string& str) { using convert_typeX = std::codecvt_utf8; - std::wstring_convert converterX; + std::wstring_convert converterX("Error in N++ string conversion s2ws!", L"Error in N++ string conversion s2ws!"); return converterX.from_bytes(str); } @@ -1231,7 +1231,7 @@ std::wstring s2ws(const std::string& str) std::string ws2s(const std::wstring& wstr) { using convert_typeX = std::codecvt_utf8; - std::wstring_convert converterX; + std::wstring_convert converterX("Error in N++ string conversion ws2s!", L"Error in N++ string conversion ws2s!"); return converterX.to_bytes(wstr); }