thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Fix punycoding strings with no ASCII chars

Browse source
This commit is contained in:
djsrv 2021-08-22 14:38:31 -04:00
parent a60e144e1e
commit 952dc3d3e1
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
common/punycode.cpp
View file

@ -132,7 +132,7 @@ static size_t decode_digit(uint32 v) {
String punycode_encode(U32String src) { String punycode_encode(U32String src) {
size_t srclen = src.size(); size_t srclen = src.size();
size_t h = 0, si; size_t h = 0, si;
String dst; String dst = "xn--";
for (si = 0; si < srclen; si++) { for (si = 0; si < srclen; si++) {
if (src[si] < 128) { if (src[si] < 128) {
@ -143,12 +143,14 @@ String punycode_encode(U32String src) {
size_t b = h; size_t b = h;
/* Write out delimiter if any basic code points were processed. */ // If every character is ASCII, return the original string.
if (h != srclen) { if (h == srclen)
dst = String::format("xn--%s-", dst.c_str());
} else {
return src; return src;
}
// If we have any ASCII characters, add '-' to separate them from
// the non-ASCII character insertions.
if (h > 0)
dst += "-";
size_t n = INITIAL_N; size_t n = INITIAL_N;
size_t bias = INITIAL_BIAS; size_t bias = INITIAL_BIAS;
@ -222,8 +224,9 @@ U32String punycode_decode(const String src1) {
size_t di = src.findLastOf('-'); size_t di = src.findLastOf('-');
// If we have no '-', the entire string is non-ASCII character insertions.
if (di == String::npos) if (di == String::npos)
return src; di = 0;
U32String dst; U32String dst;