mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-13 16:18:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

VFS: fix out of range problem in vfs::unescape

Browse Source 
Also improve unescape with "！" allowing any character
This commit is contained in:
Nekotekina 2020-03-14 12:59:09 +03:00
parent 0c65a1721d
commit bf957a575c
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
rpcs3/Emu/VFS.cpp
View File

@ -438,17 +438,30 @@ std::string vfs::unescape(std::string_view path)
std::string result;
result.reserve(path.size());
// Emulate NTS
auto get_char = [&](std::size_t pos) -> char2
{
if (pos < path.size())
{
return path[pos];
}
else
{
return '\0';
}
};
for (std::size_t i = 0, s = path.size(); i < s; i++)
{
switch (char2 c = path[i])
{
case char2{u8"！"[0]}:
{
switch (char2 c2 = path[i + 1])
switch (char2 c2 = get_char(i + 1))
{
case char2{u8"！"[1]}:
{
const uchar c3 = path[i + 2];
const uchar c3 = get_char(i + 2);
if (c3 >= 0x81 && c3 <= 0xbf)
{
@ -465,7 +478,7 @@ std::string vfs::unescape(std::string_view path)
case char2{u8"８"[2]}:
case char2{u8"９"[2]}:
{
result += path[i + 2];
result += static_cast<char>(c3);
result.back() -= u8"０"[2];
continue;
}
@ -492,15 +505,24 @@ std::string vfs::unescape(std::string_view path)
case char2{u8"Ｕ"[2]}:
case char2{u8"Ｖ"[2]}:
{
result += path[i + 2];
result += static_cast<char>(c3);
result.back() -= u8"Ａ"[2];
result.back() += 10;
continue;
}
case char2{u8"！"[2]}:
{
if (const char2 c4 = get_char(i + 3))
{
// Escape anything but null character
result += c4;
}
else
{
return result;
}
i += 3;
result += c;
continue;
}
case char2{u8"．"[2]}:
@ -572,7 +594,7 @@ std::string vfs::unescape(std::string_view path)
}
case char2{u8"｀"[1]}:
{
const uchar c3 = path[i + 2];
const uchar c3 = get_char(i + 2);
if (c3 >= 0x80 && c3 <= 0x9e)
{
@ -607,6 +629,11 @@ std::string vfs::unescape(std::string_view path)
}
break;
}
case 0:
{
// NTS detected
return result;
}
default:
{
result += c;