reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-01-16 16:48:13 +03:00
Code Issues Projects Releases Wiki Activity

Fixed wrong length buffer with "StripUnprintableWorker" and also after stripping (#893)

Browse Source 
Remove non-printable unicode char 0xFFA0 from table g_isPrintTable
Resolves #887
This commit is contained in:
Dmitry Novikov 2022-02-05 20:07:35 +07:00 committed by GitHub
parent 77b4cd3d32
commit f319f50068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rehlds/engine/unicode_strtools.cpp
View File

@ -285,7 +285,7 @@ static const uint32_t g_isPrintTable[2048] = {
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFF0000, 0xFFFFFFFF, 0xFFFCFFFF, 0xFFFFFFFF, 0x000000FF, 0x0FFF0000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFF0000, 0xFFFFFFFF, 0xFFFCFFFF, 0xFFFFFFFF, 0x000000FF, 0x0FFF0000,
0x03FF0000, 0xFFFF0000, 0xFFF7FFFF, 0xFFDF0D0B, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x9FFFFFFF, 0x03FF0000, 0xFFFF0000, 0xFFF7FFFF, 0xFFDF0D0B, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x9FFFFFFF,
0x8FFFF7EE, 0xBFFFFFFF, 0xAFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0x7FFFFFFF, 0x1CFCFCFC, 0x00000000 0x8FFFF7EE, 0xBFFFFFFF, 0xAFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0x7FFFFFFE, 0x1CFCFCFC, 0x00000000
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -474,7 +474,7 @@ static uchar16 *StripWhitespaceWorker(uchar16 *pwch, int cchLength, bool *pbStri
// walk forward in the string // walk forward in the string
while (pwch < pwchEnd) while (pwch < pwchEnd)
{ {
if (!iswspace(*pwch)) if (!iswspace(*pwch) && !Q_IsMeanSpaceW(*pwch))
break; break;
*pbStrippedWhitespace = true; *pbStrippedWhitespace = true;
@ -484,7 +484,7 @@ static uchar16 *StripWhitespaceWorker(uchar16 *pwch, int cchLength, bool *pbStri
return pwch; return pwch;
} }
uchar16 *__cdecl StripUnprintableWorker(uchar16 *pwch, bool *pStripped) uchar16 *__cdecl StripUnprintableWorker(uchar16 *pwch, int *pLength, bool *pStripped)
{ {
uchar16* rPos = pwch; uchar16* rPos = pwch;
uchar16* wPos = pwch; uchar16* wPos = pwch;
@ -503,6 +503,10 @@ uchar16 *__cdecl StripUnprintableWorker(uchar16 *pwch, bool *pStripped)
*wPos = 0; *wPos = 0;
*pStripped = rPos != wPos; *pStripped = rPos != wPos;
if (*pStripped)
*pLength = wPos - pwch;
return pwch; return pwch;
} }
@ -736,8 +740,8 @@ qboolean Q_StripUnprintableAndSpace(char *pch)
bStrippedAny = false; bStrippedAny = false;
bStrippedWhitespace = false; bStrippedWhitespace = false;
int cwch = (unsigned int)Q_UTF8ToUTF16(pch, (uchar16 *)pwch_alloced, cubDest, _STRINGCONVERTFLAG_ASSERT) >> 1; int cwch = (unsigned int)Q_UTF8ToUTF16(pch, (uchar16 *)pwch_alloced, cubDest, _STRINGCONVERTFLAG_ASSERT) >> 1;
uchar16 * pwch = StripUnprintableWorker(pwch_alloced, &bStrippedAny); uchar16 * pwch = StripUnprintableWorker(pwch_alloced, &cwch, &bStrippedAny);
pwch = StripWhitespaceWorker(pwch, cwch - 1, &bStrippedWhitespace); pwch = StripWhitespaceWorker(pwch, cwch, &bStrippedWhitespace);
if (bStrippedWhitespace || bStrippedAny) if (bStrippedWhitespace || bStrippedAny)
Q_UTF16ToUTF8(pwch, pch, cch, STRINGCONVERT_ASSERT_REPLACE); Q_UTF16ToUTF8(pwch, pch, cch, STRINGCONVERT_ASSERT_REPLACE);