Skip to content

Commit db9d0b4

Browse files
committed
Fix undefined behaviour and memory issues
1 parent ee201b7 commit db9d0b4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

tests/juce_core/juce_ReferenceCountedObject.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ TEST (ReferenceCountedObjectTests, DecReferenceCountWithoutDeleting)
7474
EXPECT_TRUE (obj->decReferenceCountWithoutDeleting());
7575
EXPECT_EQ (obj->getReferenceCount(), 0);
7676

77-
delete obj;
77+
obj = nullptr;
7878
}
7979

8080
TEST (ReferenceCountedObjectTests, DecConstReferenceCountWithoutDeleting)
@@ -85,7 +85,7 @@ TEST (ReferenceCountedObjectTests, DecConstReferenceCountWithoutDeleting)
8585
EXPECT_TRUE (obj->decReferenceCountWithoutDeleting());
8686
EXPECT_EQ (obj->getReferenceCount(), 0);
8787

88-
delete obj;
88+
obj = nullptr;
8989
}
9090

9191
// SingleThreadedReferenceCountedObject tests
@@ -125,7 +125,7 @@ TEST (SingleThreadedReferenceCountedObjectTests, DecReferenceCountWithoutDeletin
125125
EXPECT_TRUE (obj->decReferenceCountWithoutDeleting());
126126
EXPECT_EQ (obj->getReferenceCount(), 0);
127127

128-
delete obj;
128+
obj = nullptr;
129129
}
130130

131131
TEST (SingleThreadedReferenceCountedObjectTests, DecConstReferenceCountWithoutDeleting)
@@ -136,7 +136,7 @@ TEST (SingleThreadedReferenceCountedObjectTests, DecConstReferenceCountWithoutDe
136136
EXPECT_TRUE (obj->decReferenceCountWithoutDeleting());
137137
EXPECT_EQ (obj->getReferenceCount(), 0);
138138

139-
delete obj;
139+
obj = nullptr;
140140
}
141141

142142
// ReferenceCountedObjectPtr tests

tests/juce_core/juce_ZipFile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ TEST_F (ZipFileTests, CreateStreamForEntryByName)
244244
ZipFile zip (zipFile);
245245

246246
const ZipFile::ZipEntry* entry = zip.getEntry ("nonexistent.txt");
247-
EXPECT_EQ (zip.createStreamForEntry (*entry), nullptr); // Assumes the test.zip does not contain this file
247+
ASSERT_EQ (nullptr, entry);
248248
}
249249

250250
TEST_F (ZipFileTests, UncompressTo)

0 commit comments

Comments
 (0)