Fix for annoying error message when converting out of range escape

https://github.com/fish-shell/fish-shell/issues/1107
This commit is contained in:
ridiculousfish 2013-11-26 10:52:03 -08:00
parent 2c39d5b6c0
commit 5121417725
2 changed files with 17 additions and 1 deletions

View file

@ -1197,7 +1197,7 @@ static size_t read_unquoted_escape(const wchar_t *input, wcstring *result, bool
case L'U':
{
chars=8;
max_val = WCHAR_MAX;
max_val = mini(WCHAR_MAX, 0x10FFFF); // Largest Unicode code point - see #1107
break;
}

View file

@ -144,6 +144,22 @@ static void test_unescape_sane()
err(L"In unescaping '%ls', expected '%ls' but got '%ls'\n", tests[i].input, tests[i].expected, output.c_str());
}
}
// test for overflow
if (unescape_string(L"echo \\UFFFFFF", &output, UNESCAPE_DEFAULT))
{
err(L"Should not have been able to unescape \\UFFFFFF\n");
}
if (unescape_string(L"echo \\U110000", &output, UNESCAPE_DEFAULT))
{
err(L"Should not have been able to unescape \\U110000\n");
}
if (! unescape_string(L"echo \\U10FFFF", &output, UNESCAPE_DEFAULT))
{
err(L"Should have been able to unescape \\U10FFFF\n");
}
}
/**