merge bitcoin#24190: Fix sanitizer suppresions in streams_tests

kwvg · PastaPastaPasta · commit baf8dd65cdf3 · 2024-02-28T13:37:34.000-06:00
diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp
@@ -162,14 +162,10 @@ BOOST_AUTO_TEST_CASE(streams_serializedata_xor)
 {
     std::vector<std::byte> in;
     std::vector<char> expected_xor;
-    std::vector<unsigned char> key;
     CDataStream ds(in, 0, 0);
 
     // Degenerate case
-
-    key.push_back('\x00');
-    key.push_back('\x00');
-    ds.Xor(key);
+    ds.Xor({0x00, 0x00});
     BOOST_CHECK_EQUAL(
             std::string(expected_xor.begin(), expected_xor.end()),
             ds.str());
@@ -183,10 +179,8 @@ BOOST_AUTO_TEST_CASE(streams_serializedata_xor)
 
     ds.clear();
     ds.insert(ds.begin(), in.begin(), in.end());
-    key.clear();
 
-    key.push_back('\xff');
-    ds.Xor(key);
+    ds.Xor({0xff});
     BOOST_CHECK_EQUAL(
             std::string(expected_xor.begin(), expected_xor.end()),
             ds.str());
@@ -203,11 +197,7 @@ BOOST_AUTO_TEST_CASE(streams_serializedata_xor)
     ds.clear();
     ds.insert(ds.begin(), in.begin(), in.end());
 
-    key.clear();
-    key.push_back('\xff');
-    key.push_back('\x0f');
-
-    ds.Xor(key);
+    ds.Xor({0xff, 0x0f});
     BOOST_CHECK_EQUAL(
             std::string(expected_xor.begin(), expected_xor.end()),
             ds.str());
@@ -418,7 +408,7 @@ BOOST_AUTO_TEST_CASE(streams_buffered_file_rand)
                 size_t find = currentPos + InsecureRandRange(8);
                 if (find >= fileSize)
                     find = fileSize - 1;
-                bf.FindByte(static_cast<char>(find));
+                bf.FindByte(uint8_t(find));
                 // The value at each offset is the offset.
                 BOOST_CHECK_EQUAL(bf.GetPos(), find);
                 currentPos = find;
diff --git a/test/sanitizer_suppressions/ubsan b/test/sanitizer_suppressions/ubsan
@@ -70,7 +70,6 @@ implicit-integer-sign-change:test/pow_tests.cpp
 implicit-integer-sign-change:test/prevector_tests.cpp
 implicit-integer-sign-change:test/sighash_tests.cpp
 implicit-integer-sign-change:test/skiplist_tests.cpp
-implicit-integer-sign-change:test/streams_tests.cpp
 implicit-integer-sign-change:test/transaction_tests.cpp
 implicit-integer-sign-change:txmempool.cpp
 implicit-integer-sign-change:util/strencodings.cpp
