Stop TestInfo::Run() calling a function through null pointer

If the object was never created then trying to call &Test::DeleteSelf_ will dereference a null pointer, with undefined behaviour. Fixes #845

Stop TestInfo::Run() calling a function through null pointer
48e6f1f3 · Jonathan Wakely · Knut Omang · 9a502a5b · 48e6f1f3
Commit 48e6f1f3 authored Dec 23, 2016 by Jonathan Wakely Committed by Knut Omang Feb 11, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

gtest.cc googletest/src/gtest.cc +3 -1

No files found.
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -2675,10 +2675,12 @@ void TestInfo::Run() {
    test->Run();
  }

+  if (test != NULL) {
    // Deletes the test object.
    impl->os_stack_trace_getter()->UponLeavingGTest();
    internal::HandleExceptionsInMethodIfSupported(
-        test, &Test::DeleteSelf_, "the test fixture's destructor");
+	test, &Test::DeleteSelf_, "the test fixture's destructor");
+  }

  result_.set_elapsed_time(internal::GetTimeInMillis() - start);