From 855f0f3e778de66ba3943ca3ba79606f58b8b887 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 26 Feb 2019 19:40:14 +0100
Subject: io.cpp: cast to 'unsigned char' before isspace() to avoid undefined
 behaviour, for example on netBSD 8

---
 src/iso19111/io.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
index a1608464..d17d6329 100644
--- a/src/iso19111/io.cpp
+++ b/src/iso19111/io.cpp
@@ -973,7 +973,7 @@ const std::vector<WKTNodeNNPtr> &WKTNode::children() const {
 //! @cond Doxygen_Suppress
 static size_t skipSpace(const std::string &str, size_t start) {
     size_t i = start;
-    while (i < str.size() && ::isspace(str[i])) {
+    while (i < str.size() && ::isspace(static_cast<unsigned char>(str[i]))) {
         ++i;
     }
     return i;
@@ -1002,8 +1002,9 @@ WKTNodeNNPtr WKTNode::createFrom(const std::string &wkt, size_t indexStart,
     bool inString = false;
 
     for (; i < wkt.size() &&
-           (inString || (wkt[i] != '[' && wkt[i] != '(' && wkt[i] != ',' &&
-                         wkt[i] != ']' && wkt[i] != ')' && !::isspace(wkt[i])));
+           (inString ||
+            (wkt[i] != '[' && wkt[i] != '(' && wkt[i] != ',' && wkt[i] != ']' &&
+             wkt[i] != ')' && !::isspace(static_cast<unsigned char>(wkt[i]))));
          ++i) {
         if (wkt[i] == '"') {
             if (!inString) {
@@ -5317,7 +5318,7 @@ PROJStringSyntaxParser(const std::string &projString, std::vector<Step> &steps,
     {
         size_t i = 0;
         while (true) {
-            for (; isspace(c_str[i]); i++) {
+            for (; isspace(static_cast<unsigned char>(c_str[i])); i++) {
             }
             std::string token;
             bool in_string = false;
@@ -5334,7 +5335,7 @@ PROJStringSyntaxParser(const std::string &projString, std::vector<Step> &steps,
                     token += c_str[i];
                     i++;
                     continue;
-                } else if (isspace(c_str[i])) {
+                } else if (isspace(static_cast<unsigned char>(c_str[i]))) {
                     break;
                 }
                 token += c_str[i];
-- 
cgit v1.2.3