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

Merge branch 'FixConvert' into 'master' 

Fix empty string memory access

See merge request C3/C3!198
dependabot/npm_and_yarn/Src/WebController/UI/elliptic-6.5.3
Pawel Kurowski 2020-06-30 10:31:06 +01:00
parent 89eda9950e 7f45d3093e
commit 4d3a6ba190
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/Common/FSecure/CppTools/StringConversions.h
View File

@ -109,7 +109,7 @@ namespace FSecure::StringConversions
static auto Convert(std::string_view str) static auto Convert(std::string_view str)
{ {
auto state = std::mbstate_t{}; auto state = std::mbstate_t{};
auto ptr = &str[0], end = &str[0] + str.size(); auto ptr = str.data(), end = str.data() + str.size();
char16_t out; char16_t out;
std::wstring ret; std::wstring ret;
while (ptr != end) while (ptr != end)
@ -248,7 +248,7 @@ namespace FSecure::StringConversions
template<typename Tag, typename ...RestTags, typename ArgT> template<typename Tag, typename ...RestTags, typename ArgT>
auto Convert(ArgT const& str) auto Convert(ArgT const& str)
{ {
auto ret = Detail::ConvertStruct<Tag>::Convert(Detail::ViewT<ArgT>{ &str[0], std::size(str) }); auto ret = Detail::ConvertStruct<Tag>::Convert(Detail::ViewT<ArgT>{str});
if constexpr (sizeof...(RestTags) == 0) if constexpr (sizeof...(RestTags) == 0)
return ret; return ret;
else else