hack for clang -fsanitize=integer -fsanitize=nullability

cf danmar#2922

Author: Ken-Patrick

cmake/dynamic_analyzer_options.cmake

@@ -19,10 +19,12 @@ endif()
 
 if(ANALYZE_UNDEFINED)
     add_compile_options(-fsanitize=undefined)
+    add_compile_options(-fsanitize=nullability)
+    add_compile_options(-fsanitize=integer)
     add_compile_options(-fno-sanitize-recover=all)
     add_compile_options(-fno-omit-frame-pointer)
 
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=integer -fsanitize=nullability")
 endif()
 
 if(ANALYZE_DATAFLOW)

externals/simplecpp/simplecpp.cpp

@@ -2203,14 +2203,19 @@ namespace simplecpp {
                 continue;
             }
             // get previous subpath
-            const std::string::size_type pos1 = path.rfind('/', pos - 1U) + 1U;
-            const std::string previousSubPath = path.substr(pos1, pos-pos1);
+            std::string::size_type pos1 = path.rfind('/', pos - 1U);
+            if (pos1 == std::string::npos) {
+                pos1 = 0;
+            } else {
+                pos1 += 1U;
+            }
+            const std::string previousSubPath = path.substr(pos1, pos - pos1);
             if (previousSubPath == "..") {
                 // don't simplify
                 ++pos;
             } else {
                 // remove previous subpath and ".."
-                path.erase(pos1,pos-pos1+4);
+                path.erase(pos1, pos - pos1 + 4);
                 if (path.empty())
                     path = ".";
                 // update pos

test/testsamples.cpp

@@ -168,7 +168,7 @@ class TestSamples : public TestFixture {
                     es >> std::oct >> c;
                     ++from;
                     ++from;
-                    myErr.push_back(c);
+                    myErr.push_back(static_cast<char>(c));
                 } else {
                     myErr.push_back(*from);
                 }