fix ::tolower usage

Supplying negative (signed) chars would trigger UB. Also make it work
correctly for UTF-8 input.

Author: aumuell

CMakeLists.txt

@@ -504,7 +504,7 @@ else()
 endif()
 
 if(NOT VISTLE_GUI_ONLY)
-    set(BOOST_OPT ${BOOST_OPT} iostreams locale)
+    set(BOOST_OPT ${BOOST_OPT} iostreams)
 endif()
 
 if(VISTLE_INTERNAL_BOOST_MPI)
@@ -546,6 +546,7 @@ vistle_find_package(
     thread
     regex
     timer
+    locale
     ${BOOST_REQ}
     OPTIONAL_COMPONENTS
     ${BOOST_OPT})

lib/vistle/renderer/renderobject.cpp

@@ -21,8 +21,9 @@ std::string rgb_normalize_name(std::string name)
     const char *p = name.c_str();
     std::string colorname;
     while (*p) {
-        if (!isspace(*p))
-            colorname.push_back(tolower(*p));
+        auto c = static_cast<unsigned char>(*p);
+        if (!isspace(c))
+            colorname.push_back(tolower(c));
         ++p;
     }
     return colorname;

lib/vistle/util/CMakeLists.txt

@@ -15,6 +15,7 @@ set(util_SOURCES
     netpbmimage.cpp
     sleep.cpp
     stopwatch.cpp
+    strings.cpp
     sysdep.cpp
     threadname.cpp
     tools.cpp
@@ -48,6 +49,7 @@ set(util_HEADERS
     sleep.h
     ssize_t.h
     stopwatch.h
+    strings.h
     sysdep.h
     threadname.h
     tools.h
@@ -71,6 +73,8 @@ vistle_target_link_libraries(
     PRIVATE
     Boost::timer
     PRIVATE
+    Boost::locale
+    PRIVATE
     Threads::Threads
     PRIVATE
     ${BOTAN_LIBRARIES})

lib/vistle/util/strings.cpp

@@ -0,0 +1,17 @@
+#include "strings.h"
+
+#include <boost/locale/conversion.hpp>
+
+namespace vistle {
+
+std::string to_lower(const std::string &s)
+{
+    return boost::locale::to_lower(s);
+}
+
+std::string to_upper(const std::string &s)
+{
+    return boost::locale::to_upper(s);
+}
+
+} // namespace vistle

lib/vistle/util/strings.h

@@ -0,0 +1,13 @@
+#ifndef VISTLE_UTIL_STRINGS_H
+#define VISTLE_UTIL_STRINGS_H
+
+#include <string>
+#include "export.h"
+
+namespace vistle {
+
+std::string V_UTILEXPORT to_lower(const std::string &s);
+std::string V_UTILEXPORT to_upper(const std::string &s);
+
+} // namespace vistle
+#endif

module/read/ReadCsv/ReadCsv.cpp

@@ -4,6 +4,7 @@
 #include <vistle/core/points.h>
 #include <vistle/util/filesystem.h>
 #include <vistle/util/meta.h>
+#include <vistle/util/strings.h>
 
 #include <fstream>
 
@@ -133,10 +134,8 @@ bool ReadCsv::examine(const Parameter *param)
         m_choices = std::vector<std::string>{vistle::Reader::InvalidChoice};
         splitLine(m_choices, line, m_delimiter);
         auto lowerChoices = m_choices;
-        std::transform(lowerChoices.begin(), lowerChoices.end(), lowerChoices.begin(), [](std::string s) {
-            std::transform(s.begin(), s.end(), s.begin(), ::tolower);
-            return s;
-        });
+        std::transform(lowerChoices.begin(), lowerChoices.end(), lowerChoices.begin(),
+                       [](std::string s) { return to_lower(s); });
 
         for (auto p: m_selectionParams) {
             setParameterChoices(p, m_choices);

module/read/ReadEnsight/EnFile.cpp

@@ -27,6 +27,7 @@
 #include <iostream>
 #include <cfloat>
 #include <boost/algorithm/string.hpp>
+#include <vistle/util/strings.h>
 
 //#define DEBUG
 
@@ -52,7 +53,7 @@ CaseFile::BinType EnFile::guessBinType(ReadEnsight *mod, const std::string &file
     fclose(in);
 
     std::string firstLine(buf.begin(), buf.end());
-    std::transform(firstLine.begin(), firstLine.end(), firstLine.begin(), tolower);
+    firstLine = vistle::to_lower(firstLine);
 
     if ((firstLine.find("c binary") != std::string::npos) || (firstLine.find("cbinary") != std::string::npos)) {
         ret = CaseFile::CBIN;

module/render/COVER/COVER.cpp

@@ -19,6 +19,7 @@
 #include <vistle/core/placeholder.h>
 #include <vistle/core/statetracker.h>
 #include <vistle/util/threadname.h>
+#include <vistle/util/strings.h>
 
 #include <osg/Node>
 #include <osg/Group>
@@ -337,7 +338,7 @@ opencover::coVRAnimationManager::FillMode getAnimationFill(const vistle::Object:
         mode = texture->getAttribute(vistle::attribute::AnimationFill);
     if (mode.empty() && geometry)
         mode = geometry->getAttribute(vistle::attribute::AnimationFill);
-    std::transform(mode.begin(), mode.end(), mode.begin(), ::tolower);
+    mode = to_lower(mode);
     if (mode == "last")
         return opencover::coVRAnimationManager::Last;
     else if (mode == "cycle")

module/render/COVER/plugin/RhrClient/RhrClient.cpp

@@ -43,6 +43,7 @@
 #include <vistle/rhr/rfbext.h>
 #include <vistle/util/crypto.h>
 #include <vistle/util/hostname.h>
+#include <vistle/util/strings.h>
 #include <vistle/module/module.h>
 #include <vistle/core/statetracker.h>
 
@@ -547,7 +548,7 @@ bool RhrClient::init()
 
     std::string confMode = covise::coCoviseConfig::getEntry("reprojectionMode", configKey);
     if (!confMode.empty()) {
-        std::transform(confMode.begin(), confMode.end(), confMode.begin(), ::tolower);
+        confMode = vistle::to_lower(confMode);
         if (confMode == "disable" || confMode == "asis")
             m_configuredMode = MultiChannelDrawer::AsIs;
         else if (confMode == "points")