livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-14597 ensure that uris don't crash viewer

meow-7.2.2
Andrey Kleshchev 2021-01-18 17:10:21 +02:00
parent bee13995e4
commit bbd071f3d5
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
indra/llcommon/lluriparser.cpp
View File

@ -163,26 +163,37 @@ S32 LLUriParser::normalize()
mNormalizedTmp = mTmpScheme;
if (!mRes)
{
mRes = uriNormalizeSyntaxExA(&mUri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);
// Uriparser is 3p software we can not directly fix.
// On winodws this probably requires SEH handling, but all
// crashes so far were on MAC in scope of uriNormalizeSyntaxExA.
try
{
mRes = uriNormalizeSyntaxExA(&mUri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);
if (!mRes)
{
S32 chars_required;
mRes = uriToStringCharsRequiredA(&mUri, &chars_required);
if (!mRes)
{
S32 chars_required;
mRes = uriToStringCharsRequiredA(&mUri, &chars_required);
if (!mRes)
{
chars_required++;
std::vector<char> label_buf(chars_required);
mRes = uriToStringA(&label_buf[0], &mUri, chars_required, NULL);
if (!mRes)
{
chars_required++;
std::vector<char> label_buf(chars_required);
mRes = uriToStringA(&label_buf[0], &mUri, chars_required, NULL);
if (!mRes)
{
mNormalizedUri = &label_buf[mTmpScheme ? 7 : 0];
mTmpScheme = false;
}
}
}
if (!mRes)
{
mNormalizedUri = &label_buf[mTmpScheme ? 7 : 0];
mTmpScheme = false;
}
}
}
}
catch (...)
{
// At this point mNormalizedUri should contain http+unmodified input string.
LL_WARNS() << "Uriparser crashed processing: " << mNormalizedUri << LL_ENDL;
}
}
if(mTmpScheme)