Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4e32f3b authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Base: Hand complete log message to aborter 

Undo zero-termination-substitution for linebreaks when logging.
This results in handing the complete log message to the aborter.
Add a test.

Bug: 31893081
Test: mmma system/core/base && $ANDROID_HOST_OUT/nativetest64/libbase_test/libbase_test64
Change-Id: I2ef6c6351db2fd494a02985f634f439104136227
parent 1f904858

base/logging.cpp

+2 −0
Original line number Diff line number Diff line
@@ -415,6 +415,8 @@ LogMessage::~LogMessage() { 
        msg[nl] = '\0';

        LogLine(data_->GetFile(), data_->GetLineNumber(), data_->GetId(),

                data_->GetSeverity(), &msg[i]);

        // Undo the zero-termination so we can give the complete message to the aborter.

        msg[nl] = '\n';

        i = nl + 1;

      }

    }

base/logging_test.cpp

+24 −0
Original line number Diff line number Diff line
@@ -606,3 +606,27 @@ TEST(logging, LOG_FATAL_NOOP_ABORTER) { 


  ASSERT_DEATH({SuppressAbortUI(); LOG(FATAL) << "foobar";}, "foobar");

}



struct CountLineAborter {

  static void CountLineAborterFunction(const char* msg) {

    while (*msg != 0) {

      if (*msg == '\n') {

        newline_count++;

      }

      msg++;

    }

  }

  static size_t newline_count;

};

size_t CountLineAborter::newline_count = 0;



TEST(logging, LOG_FATAL_ABORTER_MESSAGE) {

  CountLineAborter::newline_count = 0;

  android::base::SetAborter(CountLineAborter::CountLineAborterFunction);



  android::base::ScopedLogSeverity sls(android::base::ERROR);

  CapturedStderr cap;

  LOG(FATAL) << "foo\nbar";



  EXPECT_EQ(CountLineAborter::newline_count, 1U + 1U);  // +1 for final '\n'.

}