Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] Fix NetworkTables memory leaks caught by asan (#3556)

Browse Source 
Closes #3543.
This commit is contained in:
Tyler Veness
2021-09-09 23:13:36 -07:00
committed by GitHub
parent 3d9a4d585e
commit 531439198e
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ntcore/src/test/native/cpp/NetworkTableTest.cpp
View File

@@ -65,6 +65,7 @@ TEST_F(NetworkTableTest, ContainsKey) {
ASSERT_TRUE(nt->ContainsKey("testkey"));
ASSERT_TRUE(inst.GetEntry("/containskey/testkey").Exists());
ASSERT_FALSE(inst.GetEntry("containskey/testkey").Exists());
nt::NetworkTableInstance::Destroy(inst);
}
TEST_F(NetworkTableTest, LeadingSlash) {
@@ -75,6 +76,7 @@ TEST_F(NetworkTableTest, LeadingSlash) {
nt2->PutNumber("testkey", 5);
ASSERT_TRUE(nt->ContainsKey("testkey"));
ASSERT_TRUE(inst.GetEntry("/leadingslash/testkey").Exists());
nt::NetworkTableInstance::Destroy(inst);
}
TEST_F(NetworkTableTest, EmptyOrNoSlash) {
@@ -85,4 +87,5 @@ TEST_F(NetworkTableTest, EmptyOrNoSlash) {
nt2->PutNumber("testkey", 5);
ASSERT_TRUE(nt->ContainsKey("testkey"));
ASSERT_TRUE(inst.GetEntry("/testkey").Exists());
nt::NetworkTableInstance::Destroy(inst);
}

10
ntcore/src/test/native/cpp/ValueTest.cpp
View File

@@ -46,6 +46,7 @@ TEST_F(ValueTest, Boolean) {
v = Value::MakeBoolean(true);
ASSERT_EQ(NT_BOOLEAN, v->type());
ASSERT_TRUE(v->GetBoolean());
NT_DisposeValue(&cv);
ConvertToC(*v, &cv);
ASSERT_EQ(NT_BOOLEAN, cv.type);
ASSERT_EQ(1, cv.data.v_boolean);
@@ -66,6 +67,7 @@ TEST_F(ValueTest, Double) {
v = Value::MakeDouble(0.25);
ASSERT_EQ(NT_DOUBLE, v->type());
ASSERT_EQ(0.25, v->GetDouble());
NT_DisposeValue(&cv);
ConvertToC(*v, &cv);
ASSERT_EQ(NT_DOUBLE, cv.type);
ASSERT_EQ(0.25, cv.data.v_double);
@@ -87,6 +89,7 @@ TEST_F(ValueTest, String) {
v = Value::MakeString("goodbye");
ASSERT_EQ(NT_STRING, v->type());
ASSERT_EQ("goodbye", v->GetString());
NT_DisposeValue(&cv);
ConvertToC(*v, &cv);
ASSERT_EQ(NT_STRING, cv.type);
ASSERT_EQ("goodbye"sv, cv.data.v_string.str);
@@ -109,6 +112,7 @@ TEST_F(ValueTest, Raw) {
v = Value::MakeRaw("goodbye");
ASSERT_EQ(NT_RAW, v->type());
ASSERT_EQ("goodbye", v->GetRaw());
NT_DisposeValue(&cv);
ConvertToC(*v, &cv);
ASSERT_EQ(NT_RAW, cv.type);
ASSERT_EQ("goodbye"sv, cv.data.v_string.str);
@@ -136,6 +140,7 @@ TEST_F(ValueTest, BooleanArray) {
v = Value::MakeBooleanArray(vec);
ASSERT_EQ(NT_BOOLEAN_ARRAY, v->type());
ASSERT_EQ(wpi::span<const int>(vec), v->GetBooleanArray());
NT_DisposeValue(&cv);
ConvertToC(*v, &cv);
ASSERT_EQ(NT_BOOLEAN_ARRAY, cv.type);
ASSERT_EQ(3u, cv.data.arr_boolean.size);
@@ -148,6 +153,7 @@ TEST_F(ValueTest, BooleanArray) {
v = Value::MakeBooleanArray(vec);
ASSERT_EQ(NT_BOOLEAN_ARRAY, v->type());
ASSERT_EQ(wpi::span<const int>(vec), v->GetBooleanArray());
NT_DisposeValue(&cv);
ConvertToC(*v, &cv);
ASSERT_EQ(NT_BOOLEAN_ARRAY, cv.type);
ASSERT_EQ(2u, cv.data.arr_boolean.size);
@@ -176,6 +182,7 @@ TEST_F(ValueTest, DoubleArray) {
v = Value::MakeDoubleArray(vec);
ASSERT_EQ(NT_DOUBLE_ARRAY, v->type());
ASSERT_EQ(wpi::span<const double>(vec), v->GetDoubleArray());
NT_DisposeValue(&cv);
ConvertToC(*v, &cv);
ASSERT_EQ(NT_DOUBLE_ARRAY, cv.type);
ASSERT_EQ(3u, cv.data.arr_double.size);
@@ -188,6 +195,7 @@ TEST_F(ValueTest, DoubleArray) {
v = Value::MakeDoubleArray(vec);
ASSERT_EQ(NT_DOUBLE_ARRAY, v->type());
ASSERT_EQ(wpi::span<const double>(vec), v->GetDoubleArray());
NT_DisposeValue(&cv);
ConvertToC(*v, &cv);
ASSERT_EQ(NT_DOUBLE_ARRAY, cv.type);
ASSERT_EQ(2u, cv.data.arr_double.size);
@@ -228,6 +236,7 @@ TEST_F(ValueTest, StringArray) {
ASSERT_EQ("s1"sv, v->GetStringArray()[0]);
ASSERT_EQ("str2"sv, v->GetStringArray()[1]);
ASSERT_EQ("string3"sv, v->GetStringArray()[2]);
NT_DisposeValue(&cv);
ConvertToC(*v, &cv);
ASSERT_EQ(NT_STRING_ARRAY, cv.type);
ASSERT_EQ(3u, cv.data.arr_string.size);
@@ -244,6 +253,7 @@ TEST_F(ValueTest, StringArray) {
ASSERT_EQ(2u, v->GetStringArray().size());
ASSERT_EQ("short"sv, v->GetStringArray()[0]);
ASSERT_EQ("er"sv, v->GetStringArray()[1]);
NT_DisposeValue(&cv);
ConvertToC(*v, &cv);
ASSERT_EQ(NT_STRING_ARRAY, cv.type);
ASSERT_EQ(2u, cv.data.arr_string.size);