zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow logging of char* null pointer.

Browse Source 
Bug: chromium:927027
Change-Id: I220c11b1b2dd2921c814a361009d008e74245af3
Reviewed-on: https://webrtc-review.googlesource.com/c/121426
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26557}
This commit is contained in:
Niels Möller
2019-02-04 19:23:58 +01:00
committed by Commit Bot
parent 99b275d126
commit 65835be722
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtc_base/logging.cc
View File

@ -531,9 +531,11 @@ void Log(const LogArgType* fmt, ...) {
case LogArgType::kLongDouble:
log_message.stream() << va_arg(args, long double);
break;
case LogArgType::kCharP:
log_message.stream() << va_arg(args, const char*);
case LogArgType::kCharP: {
const char* s = va_arg(args, const char*);
log_message.stream() << (s ? s : "(null)");
break;
}
case LogArgType::kStdString:
log_message.stream() << *va_arg(args, const std::string*);
break;

8
rtc_base/logging_unittest.cc
View File

@ -162,13 +162,14 @@ TEST(LogTest, SingleStream) {
std::string s1 = "char*";
std::string s2 = "std::string";
std::string s3 = "absl::stringview";
const char* null_string = nullptr;
void* p = reinterpret_cast<void*>(0xabcd);
// Log all suported types(except doubles/floats) as a sanity-check.
RTC_LOG(LS_INFO) << "|" << i << "|" << l << "|" << ll << "|" << u << "|" << ul
<< "|" << ull << "|" << s1.c_str() << "|" << s2 << "|"
<< absl::string_view(s3) << "|" << p << "|";
<< absl::string_view(s3) << "|" << p << "|" << null_string
<< "|";
// Signed integers
EXPECT_NE(std::string::npos, str.find("|1|"));
@ -188,6 +189,9 @@ TEST(LogTest, SingleStream) {
// void*
EXPECT_NE(std::string::npos, str.find("|abcd|"));
// null char*
EXPECT_NE(std::string::npos, str.find("|(null)|"));
LogMessage::RemoveLogToStream(&stream);
EXPECT_EQ(LS_NONE, LogMessage::GetLogToStream(&stream));
EXPECT_EQ(sev, LogMessage::GetLogToStream(nullptr));