zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-15 16:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added unsigned char casts to all isspace calls in zstring.cpp

Browse source 
isspace takes a signed integer as parameter which triggers an assert on any non-ASCII character taken from a signed char array.
This commit is contained in:
Christoph Oelckers 2016-11-14 13:12:55 +01:00
parent 02435b46a0
commit 109558d74d
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/zstring.cpp
View file

@ -632,7 +632,7 @@ void FString::StripLeft ()
if (max == 0) return;
for (i = 0; i < max; ++i)
{
if (!isspace(Chars[i]))
if (!isspace((unsigned char)Chars[i]))
break;
}
if (i == 0)
@ -697,7 +697,7 @@ void FString::StripRight ()
if (max == 0) return;
for (i = --max; i-- > 0; )
{
if (!isspace(Chars[i]))
if (!isspace((unsigned char)Chars[i]))
break;
}
if (i == max)
@ -756,12 +756,12 @@ void FString::StripLeftRight ()
if (max == 0) return;
for (i = 0; i < max; ++i)
{
if (!isspace(Chars[i]))
if (!isspace((unsigned char)Chars[i]))
break;
}
for (j = max - 1; j >= i; --j)
{
if (!isspace(Chars[j]))
if (!isspace((unsigned char)Chars[j]))
break;
}
if (i == 0 && j == max - 1)
@ -1040,7 +1040,7 @@ octdigits = [0-7];
yych = *YYCURSOR;
// Skip preceding whitespace
while (yych != '\0' && isspace(yych)) { yych = *++YYCURSOR; }
while (yych != '\0' && isspace((unsigned char)yych)) { yych = *++YYCURSOR; }
// Check for sign
if (yych == '+' || yych == '-') { yych = *++YYCURSOR; }
@ -1078,7 +1078,7 @@ octdigits = [0-7];
}
// The rest should all be whitespace
while (yych != '\0' && isspace(yych)) { yych = *++YYCURSOR; }
while (yych != '\0' && isspace((unsigned char)yych)) { yych = *++YYCURSOR; }
return yych == '\0';
}
@ -1098,7 +1098,7 @@ digits = [0-9];
yych = *YYCURSOR;
// Skip preceding whitespace
while (yych != '\0' && isspace(yych)) { yych = *++YYCURSOR; }
while (yych != '\0' && isspace((unsigned char)yych)) { yych = *++YYCURSOR; }
// Check for sign
if (yych == '+' || yych == '-') { yych = *++YYCURSOR; }
@ -1129,7 +1129,7 @@ digits = [0-9];
}
// The rest should all be whitespace
while (yych != '\0' && isspace(yych)) { yych = *++YYCURSOR; }
while (yych != '\0' && isspace((unsigned char)yych)) { yych = *++YYCURSOR; }
return yych == '\0';
}