commit 41ad12e2527894a381cb8a5515f49039e14a8484
author Nicolas Geoffray <ngeoffray@google.com> Mon May 23 09:31:00 2022 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Mon May 23 12:26:04 2022 +0000
tree 433354713cc2336755ae6dda97ca0d302c993380
parent 45995d9b36a4f9e28ede78807fbc2e17417329c0

Add a null check for suppressed exception.

ScopedExceptionStorage may be used when there is no pending exception.

Test: m
Bug: 233191719
Change-Id: I03c4da8e55a9259e646d2acdacdcf75f107d3f43

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index e629b4e..e7c6bec 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -4613,7 +4613,9 @@
   CHECK(self_->IsExceptionPending()) << *self_;
   ObjPtr<mirror::Throwable> old_suppressed(excp_.Get());
   excp_.Assign(self_->GetException());
-  LOG(WARNING) << message << "Suppressing old exception: " << old_suppressed->Dump();
+  if (old_suppressed != nullptr) {
+    LOG(WARNING) << message << "Suppressing old exception: " << old_suppressed->Dump();
+  }
   self_->ClearException();
 }