Skip to content

Commit 2878167

Browse files
laanwjlaanwj
committed
Merge #20000: test: fix creation of "std::string"s with \0s
ecc6cf1 test: fix creation of std::string objects with \0s (Vasil Dimov) Pull request description: A string literal `"abc"` contains a terminating `\0`, so that is 4 bytes. There is no need to write `"abc\0"` unless two terminating `\0`s are necessary. `std::string` objects do not internally contain a terminating `\0`, so `std::string("abc")` creates a string with size 3 and is the same as `std::string("abc", 3)`. In `"\01"` the `01` part is interpreted as one number (1) and that is the same as `"\1"` which is a string like `{1, 0}` whereas `"\0z"` is a string like `{0, 'z', 0}`. To create a string like `{0, '1', 0}` one must use `"\0" "1"`. Adjust the tests accordingly. ACKs for top commit: laanwj: ACK ecc6cf1 practicalswift: ACK ecc6cf1 modulo happily green CI Tree-SHA512: 5eb489e8533a4199a9324b92f7280041552379731ebf7dfee169f70d5458e20e29b36f8bfaee6f201f48ab2b9d1d0fc4bdf8d6e4c58d6102f399cfbea54a219e
2 parents 0a267f4 + ecc6cf1 commit 2878167

File tree

6 files changed

+59
-44
lines changed

6 files changed

+59
-44
lines changed

‎src/test/base32_tests.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#include <util/strencodings.h>
77

88
#include <boost/test/unit_test.hpp>
9+
#include <string>
10+
11+
using namespace std::literals;
912

1013
BOOST_FIXTURE_TEST_SUITE(base32_tests, BasicTestingSetup)
1114

@@ -26,14 +29,14 @@ BOOST_AUTO_TEST_CASE(base32_testvectors)
2629

2730
// Decoding strings with embedded NUL characters should fail
2831
bool failure;
29-
(void)DecodeBase32(std::string("invalid", 7), &failure);
30-
BOOST_CHECK_EQUAL(failure, true);
31-
(void)DecodeBase32(std::string("AWSX3VPP", 8), &failure);
32-
BOOST_CHECK_EQUAL(failure, false);
33-
(void)DecodeBase32(std::string("AWSX3VPP\0invalid", 16), &failure);
34-
BOOST_CHECK_EQUAL(failure, true);
35-
(void)DecodeBase32(std::string("AWSX3VPPinvalid", 15), &failure);
36-
BOOST_CHECK_EQUAL(failure, true);
32+
(void)DecodeBase32("invalid\0"s, &failure); // correct size, invalid due to \0
33+
BOOST_CHECK(failure);
34+
(void)DecodeBase32("AWSX3VPP"s, &failure); // valid
35+
BOOST_CHECK(!failure);
36+
(void)DecodeBase32("AWSX3VPP\0invalid"s, &failure); // correct size, invalid due to \0
37+
BOOST_CHECK(failure);
38+
(void)DecodeBase32("AWSX3VPPinvalid"s, &failure); // invalid size
39+
BOOST_CHECK(failure);
3740
}
3841

3942
BOOST_AUTO_TEST_SUITE_END()

‎src/test/base58_tests.cpp

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
#include <univalue.h>
1313

1414
#include <boost/test/unit_test.hpp>
15+
#include <string>
1516

17+
using namespace std::literals;
1618

1719
extern UniValue read_json(const std::string& jsondata);
1820

@@ -58,25 +60,25 @@ BOOST_AUTO_TEST_CASE(base58_DecodeBase58)
5860
BOOST_CHECK_MESSAGE(result.size() == expected.size() && std::equal(result.begin(), result.end(), expected.begin()), strTest);
5961
}
6062

61-
BOOST_CHECK(!DecodeBase58("invalid", result, 100));
62-
BOOST_CHECK(!DecodeBase58(std::string("invalid"), result, 100));
63-
BOOST_CHECK(!DecodeBase58(std::string("\0invalid", 8), result, 100));
63+
BOOST_CHECK(!DecodeBase58("invalid"s, result, 100));
64+
BOOST_CHECK(!DecodeBase58("invalid\0"s, result, 100));
65+
BOOST_CHECK(!DecodeBase58("\0invalid"s, result, 100));
6466

65-
BOOST_CHECK(DecodeBase58(std::string("good", 4), result, 100));
66-
BOOST_CHECK(!DecodeBase58(std::string("bad0IOl", 7), result, 100));
67-
BOOST_CHECK(!DecodeBase58(std::string("goodbad0IOl", 11), result, 100));
68-
BOOST_CHECK(!DecodeBase58(std::string("good\0bad0IOl", 12), result, 100));
67+
BOOST_CHECK(DecodeBase58("good"s, result, 100));
68+
BOOST_CHECK(!DecodeBase58("bad0IOl"s, result, 100));
69+
BOOST_CHECK(!DecodeBase58("goodbad0IOl"s, result, 100));
70+
BOOST_CHECK(!DecodeBase58("good\0bad0IOl"s, result, 100));
6971

7072
// check that DecodeBase58 skips whitespace, but still fails with unexpected non-whitespace at the end.
7173
BOOST_CHECK(!DecodeBase58(" \t\n\v\f\r skip \r\f\v\n\t a", result, 3));
7274
BOOST_CHECK( DecodeBase58(" \t\n\v\f\r skip \r\f\v\n\t ", result, 3));
7375
std::vector<unsigned char> expected = ParseHex("971a55");
7476
BOOST_CHECK_EQUAL_COLLECTIONS(result.begin(), result.end(), expected.begin(), expected.end());
7577

76-
BOOST_CHECK(DecodeBase58Check(std::string("3vQB7B6MrGQZaxCuFg4oh", 21), result, 100));
77-
BOOST_CHECK(!DecodeBase58Check(std::string("3vQB7B6MrGQZaxCuFg4oi", 21), result, 100));
78-
BOOST_CHECK(!DecodeBase58Check(std::string("3vQB7B6MrGQZaxCuFg4oh0IOl", 25), result, 100));
79-
BOOST_CHECK(!DecodeBase58Check(std::string("3vQB7B6MrGQZaxCuFg4oh\00IOl", 26), result, 100));
78+
BOOST_CHECK(DecodeBase58Check("3vQB7B6MrGQZaxCuFg4oh"s, result, 100));
79+
BOOST_CHECK(!DecodeBase58Check("3vQB7B6MrGQZaxCuFg4oi"s, result, 100));
80+
BOOST_CHECK(!DecodeBase58Check("3vQB7B6MrGQZaxCuFg4oh0IOl"s, result, 100));
81+
BOOST_CHECK(!DecodeBase58Check("3vQB7B6MrGQZaxCuFg4oh\0" "0IOl"s, result, 100));
8082
}
8183

8284
BOOST_AUTO_TEST_CASE(base58_random_encode_decode)

‎src/test/base64_tests.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#include <util/strencodings.h>
77

88
#include <boost/test/unit_test.hpp>
9+
#include <string>
10+
11+
using namespace std::literals;
912

1013
BOOST_FIXTURE_TEST_SUITE(base64_tests, BasicTestingSetup)
1114

@@ -23,14 +26,14 @@ BOOST_AUTO_TEST_CASE(base64_testvectors)
2326

2427
// Decoding strings with embedded NUL characters should fail
2528
bool failure;
26-
(void)DecodeBase64(std::string("invalid", 7), &failure);
27-
BOOST_CHECK_EQUAL(failure, true);
28-
(void)DecodeBase64(std::string("nQB/pZw=", 8), &failure);
29-
BOOST_CHECK_EQUAL(failure, false);
30-
(void)DecodeBase64(std::string("nQB/pZw=\0invalid", 16), &failure);
31-
BOOST_CHECK_EQUAL(failure, true);
32-
(void)DecodeBase64(std::string("nQB/pZw=invalid", 15), &failure);
33-
BOOST_CHECK_EQUAL(failure, true);
29+
(void)DecodeBase64("invalid\0"s, &failure);
30+
BOOST_CHECK(failure);
31+
(void)DecodeBase64("nQB/pZw="s, &failure);
32+
BOOST_CHECK(!failure);
33+
(void)DecodeBase64("nQB/pZw=\0invalid"s, &failure);
34+
BOOST_CHECK(failure);
35+
(void)DecodeBase64("nQB/pZw=invalid\0"s, &failure);
36+
BOOST_CHECK(failure);
3437
}
3538

3639
BOOST_AUTO_TEST_SUITE_END()

‎src/test/net_tests.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include <memory>
2626
#include <string>
2727

28+
using namespace std::literals;
29+
2830
class CAddrManSerializationMock : public CAddrMan
2931
{
3032
public:
@@ -106,8 +108,8 @@ BOOST_AUTO_TEST_CASE(caddrdb_read)
106108
BOOST_CHECK(Lookup("250.7.1.1", addr1, 8333, false));
107109
BOOST_CHECK(Lookup("250.7.2.2", addr2, 9999, false));
108110
BOOST_CHECK(Lookup("250.7.3.3", addr3, 9999, false));
109-
BOOST_CHECK(Lookup(std::string("250.7.3.3", 9), addr3, 9999, false));
110-
BOOST_CHECK(!Lookup(std::string("250.7.3.3\0example.com", 21), addr3, 9999, false));
111+
BOOST_CHECK(Lookup("250.7.3.3"s, addr3, 9999, false));
112+
BOOST_CHECK(!Lookup("250.7.3.3\0example.com"s, addr3, 9999, false));
111113

112114
// Add three addresses to new table.
113115
CService source;

‎src/test/netbase_tests.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
#include <boost/test/unit_test.hpp>
1818

19+
using namespace std::literals;
20+
1921
BOOST_FIXTURE_TEST_SUITE(netbase_tests, BasicTestingSetup)
2022

2123
static CNetAddr ResolveIP(const std::string& ip)
@@ -431,20 +433,20 @@ BOOST_AUTO_TEST_CASE(netpermissions_test)
431433
BOOST_AUTO_TEST_CASE(netbase_dont_resolve_strings_with_embedded_nul_characters)
432434
{
433435
CNetAddr addr;
434-
BOOST_CHECK(LookupHost(std::string("127.0.0.1", 9), addr, false));
435-
BOOST_CHECK(!LookupHost(std::string("127.0.0.1\0", 10), addr, false));
436-
BOOST_CHECK(!LookupHost(std::string("127.0.0.1\0example.com", 21), addr, false));
437-
BOOST_CHECK(!LookupHost(std::string("127.0.0.1\0example.com\0", 22), addr, false));
436+
BOOST_CHECK(LookupHost("127.0.0.1"s, addr, false));
437+
BOOST_CHECK(!LookupHost("127.0.0.1\0"s, addr, false));
438+
BOOST_CHECK(!LookupHost("127.0.0.1\0example.com"s, addr, false));
439+
BOOST_CHECK(!LookupHost("127.0.0.1\0example.com\0"s, addr, false));
438440
CSubNet ret;
439-
BOOST_CHECK(LookupSubNet(std::string("1.2.3.0/24", 10), ret));
440-
BOOST_CHECK(!LookupSubNet(std::string("1.2.3.0/24\0", 11), ret));
441-
BOOST_CHECK(!LookupSubNet(std::string("1.2.3.0/24\0example.com", 22), ret));
442-
BOOST_CHECK(!LookupSubNet(std::string("1.2.3.0/24\0example.com\0", 23), ret));
441+
BOOST_CHECK(LookupSubNet("1.2.3.0/24"s, ret));
442+
BOOST_CHECK(!LookupSubNet("1.2.3.0/24\0"s, ret));
443+
BOOST_CHECK(!LookupSubNet("1.2.3.0/24\0example.com"s, ret));
444+
BOOST_CHECK(!LookupSubNet("1.2.3.0/24\0example.com\0"s, ret));
443445
// We only do subnetting for IPv4 and IPv6
444-
BOOST_CHECK(!LookupSubNet(std::string("5wyqrzbvrdsumnok.onion", 22), ret));
445-
BOOST_CHECK(!LookupSubNet(std::string("5wyqrzbvrdsumnok.onion\0", 23), ret));
446-
BOOST_CHECK(!LookupSubNet(std::string("5wyqrzbvrdsumnok.onion\0example.com", 34), ret));
447-
BOOST_CHECK(!LookupSubNet(std::string("5wyqrzbvrdsumnok.onion\0example.com\0", 35), ret));
446+
BOOST_CHECK(!LookupSubNet("5wyqrzbvrdsumnok.onion"s, ret));
447+
BOOST_CHECK(!LookupSubNet("5wyqrzbvrdsumnok.onion\0"s, ret));
448+
BOOST_CHECK(!LookupSubNet("5wyqrzbvrdsumnok.onion\0example.com"s, ret));
449+
BOOST_CHECK(!LookupSubNet("5wyqrzbvrdsumnok.onion\0example.com\0"s, ret));
448450
}
449451

450452
// Since CNetAddr (un)ser is tested separately in net_tests.cpp here we only

‎src/test/util_tests.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
#include <array>
2525
#include <stdint.h>
26+
#include <string.h>
2627
#include <thread>
2728
#include <univalue.h>
2829
#include <utility>
@@ -35,6 +36,8 @@
3536

3637
#include <boost/test/unit_test.hpp>
3738

39+
using namespace std::literals;
40+
3841
/* defined in logging.cpp */
3942
namespace BCLog {
4043
std::string LogEscapeMessage(const std::string& str);
@@ -1257,9 +1260,9 @@ BOOST_AUTO_TEST_CASE(util_ParseMoney)
12571260
BOOST_CHECK(!ParseMoney("-1", ret));
12581261

12591262
// Parsing strings with embedded NUL characters should fail
1260-
BOOST_CHECK(!ParseMoney(std::string("\0-1", 3), ret));
1261-
BOOST_CHECK(!ParseMoney(std::string("\01", 2), ret));
1262-
BOOST_CHECK(!ParseMoney(std::string("1\0", 2), ret));
1263+
BOOST_CHECK(!ParseMoney("\0-1"s, ret));
1264+
BOOST_CHECK(!ParseMoney("\0" "1"s, ret));
1265+
BOOST_CHECK(!ParseMoney("1\0"s, ret));
12631266
}
12641267

12651268
BOOST_AUTO_TEST_CASE(util_IsHex)

0 commit comments

Comments
 (0)