commit c65ea94b2f06b7c40ad14d75d8bc9e59bafba8b0
author Andreas Gampe <agampe@google.com> Fri Sep 23 13:31:52 2016 -0700
committer Andreas Gampe <agampe@google.com> Fri Sep 23 13:31:52 2016 -0700
tree 29516cec15539d9c1b32e77c5f2ad393b0dd848b
parent adc0e3d1d0edab647f2151029d1ba542a62c4b53

Base: Check severity in destructor

Bug: 31338270
Test: m
Test: mmma system/core/base && $ANDROID_HOST_OUT/nativetest64/libbase_test/libbase_test64
Change-Id: Ic077822bcfd591bd11f4fa9d4b6e440b461c70c1

logging.cpp

diff --git a/logging.cpp b/logging.cpp
index 77a0a43..2ca2246 100644
--- a/logging.cpp
+++ b/logging.cpp
@@ -390,6 +390,11 @@
 }
 
 LogMessage::~LogMessage() {
+  // Check severity again. This is duplicate work wrt/ LOG macros, but not LOG_STREAM.
+  if (!WOULD_LOG_SEVERITY(data_->GetSeverity())) {
+    return;
+  }
+
   // Finish constructing the message.
   if (data_->GetError() != -1) {
     data_->GetBuffer() << ": " << strerror(data_->GetError());