Fix UT failures with UBSan (vesoft-inc#1661)

* Fixed two failures found by UBSan * Tweaks to make UBSan more usable
nildot · Jan 19, 2020 · f80b1aa · f80b1aa
1 parent c62e5cf
commit f80b1aa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -275,8 +275,11 @@ endif()
 
 include(CheckCXXCompilerFlag)
 
-if(ENABLE_ASAN)
+if(ENABLE_ASAN OR ENABLE_UBSAN)
     add_definitions(-DBUILT_WITH_SANITIZER)
+endif()
+
+if(ENABLE_ASAN)
     set(CMAKE_REQUIRED_FLAGS "-fsanitize=address")
     check_cxx_compiler_flag("-fsanitize=address" ENABLE_ASAN_OK)
     if (NOT ENABLE_ASAN_OK)
@@ -294,6 +297,7 @@ if(ENABLE_UBSAN)
         MESSAGE(FATAL_ERROR "The compiler does not support Undefined Behavior Sanitizer")
     endif()
     add_compile_options(-fsanitize=undefined -fno-sanitize=alignment)
+    add_compile_options(-fno-sanitize-recover=all)  # Exit on failure
     # TODO(dutor) Remove the following line when RTTI-enabled RocksDB is ready
     add_compile_options(-fno-sanitize=vptr)
     if(NOT ENABLE_ASAN)

diff --git a/src/common/base/SanitizerOptions.cpp b/src/common/base/SanitizerOptions.cpp
@@ -58,6 +58,12 @@ const char* __lsan_default_suppressions() {
            "";
 }
 
+
+SANITIZER_HOOK_ATTRIBUTES
+const char* __ubsan_default_options() {
+    return "print_stacktrace=1 \n";
+}
+
 }   // extern "C"
 
 #undef SANITIZER_HOOK_ATTRIBUTES

diff --git a/src/graph/test/YieldTest.cpp b/src/graph/test/YieldTest.cpp
@@ -570,12 +570,15 @@ TEST_F(YieldTest, calculateOverflow) {
         auto code = client->execute(query, resp);
         ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code);
     }
+    // Negation of -9223372036854775808 incurs a runtime error under UBSan
+#ifndef BUILT_WITH_SANITIZER
     {
         cpp2::ExecutionResponse resp;
         std::string query = "YIELD -9223372036854775808";
         auto code = client->execute(query, resp);
         ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code);
     }
+#endif
     {
         cpp2::ExecutionResponse resp;
         std::string query = "YIELD -9223372036854775809";

diff --git a/src/storage/test/QueryVertexPropsTest.cpp b/src/storage/test/QueryVertexPropsTest.cpp
@@ -190,7 +190,7 @@ TEST(QueryVertexPropsTest, QueryAfterTagAltered) {
     auto schemaMng = TestUtils::mockSchemaMan();
 
     auto spaceId = 0;
-    TagVersion version = std::numeric_limits<int64_t>::max() - 0;
+    TagVersion version = std::numeric_limits<int64_t>::max() / 2 /* in case of overflow */;
 
     {
         LOG(INFO) << "Prepare data...";