Fix potentially broken white space truncation on certain Windows versions

Testing the Planner in Subsurface on a Windows XP SP3 installation,
shows corrupted UTF-8 strings in the case of Cyrillic locales, but
possibly others as well. Instead limited to the Planner, this affects
the entire application.

After some examination it appears that <ctype>'s isspace() in MSVC
on the tested version of Windows is broken for some UTF-8 characters,
after enabling the user locale using: setlocale(LC_ALL, "");

For example, characters such as the Cyrillic capital "BE" are defined as:
0xD091, where isspace() for the first byte returns 0x08, which is the
bytemask for C1_SPACE and the character is treated as space.
After a byte is treated as space, it is usually discarded from a UTF-8
character/string, where if only one byte left, corrupting the entire
string.

In Subsurface, usages of string trimming are present in multiple
locations, so to make this work try to use GLib's g_ascii_isspace(),
which is a locale agnostic version of isspace().

Affected versions of Windows could be everything up to XP SP3,
but not apparently Vista.

Reported-by: Sergey Starosek <sergey.starosek@gmail.com>
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 12 insertions, 12 deletions

diff --git a/planner.c b/planner.c
index d5a733e6e..b11cda138 100644
--- a/planner.c
+++ b/planner.c
@@ -789,7 +789,7 @@ static int validate_gas(const char *text, int *o2_p, int *he_p)
 	if (!text)
 		return 0;
 
-	while (isspace(*text))
+	while (g_ascii_isspace(*text))
 		text++;
 
 	if (!*text)
@@ -806,7 +806,7 @@ static int validate_gas(const char *text, int *o2_p, int *he_p)
 	}
 
 	/* We don't want any extra crud */
-	while (isspace(*text))
+	while (g_ascii_isspace(*text))
 		text++;
 	if (*text)
 		return 0;
@@ -829,14 +829,14 @@ static int validate_time(const char *text, int *sec_p, int *rel_p)
 	if (!text)
 		return 0;
 
-	while (isspace(*text))
+	while (g_ascii_isspace(*text))
 		text++;
 
 	rel = 0;
 	if (*text == '+') {
 		rel = 1;
 		text++;
-		while (isspace(*text))
+		while (g_ascii_isspace(*text))
 			text++;
 	}
 
@@ -873,7 +873,7 @@ static int validate_time(const char *text, int *sec_p, int *rel_p)
 	}
 
 	/* Maybe we should accept 'min' at the end? */
-	if (isspace(*text))
+	if (g_ascii_isspace(*text))
 		text++;
 	if (*text)
 		return 0;
@@ -894,7 +894,7 @@ static int validate_depth(const char *text, int *mm_p)
 	if (depth < 0)
 		return 0;
 
-	while (isspace(*text))
+	while (g_ascii_isspace(*text))
 		text++;
 
 	imperial = get_units()->length == FEET;
@@ -905,7 +905,7 @@ static int validate_depth(const char *text, int *mm_p)
 		imperial = 1;
 		text += 2;
 	}
-	while (isspace(*text))
+	while (g_ascii_isspace(*text))
 		text++;
 	if (*text)
 		return 0;
@@ -933,10 +933,10 @@ static int validate_po2(const char *text, int *mbar_po2)
 	if (po2 < 0)
 		return 0;
 
-	while (isspace(*text))
+	while (g_ascii_isspace(*text))
 		text++;
 
-	while (isspace(*text))
+	while (g_ascii_isspace(*text))
 		text++;
 	if (*text)
 		return 0;
@@ -956,7 +956,7 @@ static int validate_volume(const char *text, int *sac)
 	if (volume < 0)
 		return 0;
 
-	while (isspace(*text))
+	while (g_ascii_isspace(*text))
 		text++;
 
 	imperial = get_units()->volume == CUFT;
@@ -967,11 +967,11 @@ static int validate_volume(const char *text, int *sac)
 		imperial = 1;
 		text += 4;
 	}
-	while (isspace(*text) || *text == '/')
+	while (g_ascii_isspace(*text) || *text == '/')
 		text++;
 	if (!strncasecmp(text, _("min"), 3))
 		text += 3;
-	while (isspace(*text))
+	while (g_ascii_isspace(*text))
 		text++;
 	if (*text)
 		return 0;