Fixed: StripUnprintableWorker did not count the null terminator

dreamstalker · Jul 10, 2022 · e9045e3 · e9045e3
1 parent be0e1c8
commit e9045e3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/rehlds/engine/unicode_strtools.cpp b/rehlds/engine/unicode_strtools.cpp
@@ -461,7 +461,7 @@ static uchar16 *StripWhitespaceWorker(uchar16 *pwch, int cchLength, bool *pbStri
  // walk backwards from the end of the string, killing any whitespace
  *pbStrippedWhitespace = false;
 
- uchar16 *pwchEnd = pwch + cchLength;
+ uchar16 *pwchEnd = pwch + cchLength - 1;
  while (--pwchEnd >= pwch)
  {
  if (!iswspace(*pwchEnd) && !Q_IsMeanSpaceW(*pwchEnd))
@@ -505,7 +505,7 @@ uchar16 *__cdecl StripUnprintableWorker(uchar16 *pwch, int *pLength, bool *pStri
  *pStripped = rPos != wPos;
 
  if (*pStripped)
- *pLength = wPos - pwch;
+ *pLength = (wPos - pwch) + 1; // null termination
 
  return pwch;
 }