Remove invalid use of null references (undefined behaviour)

Enable the relevant compiler warning as an error, if supported (-Werror=undefined-bool-conversion). http://www.gotw.ca/conv/002.htm http://stackoverflow.com/questions/2165078/a-reference-can-not-be-null-or-it-can-be-null (cherry picked from commit f2911ac)
boxbackup · Jan 15, 2018 · 61995c3 · 61995c3
1 parent ad86838
commit 61995c3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4
@@ -28,6 +28,7 @@ BOX_CHECK_CXX_FLAG(-Werror=return-type)
 BOX_CHECK_CXX_FLAG(-Werror=non-virtual-dtor)
 BOX_CHECK_CXX_FLAG(-Werror=delete-non-virtual-dtor)
 BOX_CHECK_CXX_FLAG(-Werror=parentheses)
+BOX_CHECK_CXX_FLAG(-Werror=undefined-bool-conversion)
 BOX_CHECK_CXX_FLAG(-Werror=overloaded-virtual)
 # This error is detected by MSVC, but not usually by GCC/Clang:
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58114

diff --git a/lib/common/Timer.cpp b/lib/common/Timer.cpp
@@ -151,7 +151,6 @@ void Timers::AssertInitialised()
 void Timers::Add(Timer& rTimer)
 {
 	ASSERT(spTimers);
-	ASSERT(&rTimer);
 	BOX_TRACE(TIMER_ID_OF(rTimer) " added to global queue, rescheduling");
 	spTimers->push_back(&rTimer);
 	Reschedule();
@@ -168,8 +167,6 @@ void Timers::Add(Timer& rTimer)
 // --------------------------------------------------------------------------
 void Timers::Remove(Timer& rTimer)
 {
-	ASSERT(&rTimer);
-
 	if(!spTimers)
 	{
 		BOX_WARNING(TIMER_ID_OF(rTimer) " was still active after "

diff --git a/test/common/testcommon.cpp b/test/common/testcommon.cpp
@@ -358,10 +358,11 @@ void test_timers()
 	// Check that using timer methods without initialisation
 	// throws an assertion failure. Can only do this in debug mode
 	#ifndef BOX_RELEASE_BUILD
-		TEST_CHECK_THROWS(Timers::Add(*(Timer*)NULL),
-			CommonException, AssertFailed);
-		TEST_CHECK_THROWS(Timers::Remove(*(Timer*)NULL),
-			CommonException, AssertFailed);
+	{
+		Timer tim(0, "tim");
+		TEST_CHECK_THROWS(Timers::Add(tim), CommonException, AssertFailed);
+		Timers::Remove(tim);
+	}
 	#endif
 
 	// TEST_CHECK_THROWS(Timers::Signal(), CommonException, AssertFailed);