godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Fix url_decode with mixed percent-encoding/Unicode strings. Treat Unix drive names as UTF-8 encoded.

Browse Source
This commit is contained in:
bruvzg
2021-04-30 21:22:39 +03:00
parent 28f56e2cbf
commit b6a21f85a7
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/string/ustring.cpp
View File

@@ -3784,27 +3784,28 @@ String String::uri_encode() const {
}
String String::uri_decode() const {
String res;
for (int i = 0; i < length(); ++i) {
if (unicode_at(i) == '%' && i + 2 < length()) {
char32_t ord1 = unicode_at(i + 1);
CharString src = utf8();
CharString res;
for (int i = 0; i < src.length(); ++i) {
if (src[i] == '%' && i + 2 < src.length()) {
char ord1 = src[i + 1];
if ((ord1 >= '0' && ord1 <= '9') || (ord1 >= 'A' && ord1 <= 'Z')) {
char32_t ord2 = unicode_at(i + 2);
char ord2 = src[i + 2];
if ((ord2 >= '0' && ord2 <= '9') || (ord2 >= 'A' && ord2 <= 'Z')) {
char bytes[3] = { (char)ord1, (char)ord2, 0 };
res += (char)strtol(bytes, nullptr, 16);
i += 2;
}
} else {
res += unicode_at(i);
res += src[i];
}
} else if (unicode_at(i) == '+') {
} else if (src[i] == '+') {
res += ' ';
} else {
res += unicode_at(i);
res += src[i];
}
}
return String::utf8(res.ascii());
return String::utf8(res);
}
String String::c_unescape() const {