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

Fix format string bug in RTC_CHECK facility.

Browse Source 
Bug: None
Change-Id: I7ba9bb582b30caa4be44b53f94df6efbe60b0000
Reviewed-on: https://webrtc-review.googlesource.com/33000
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21272}
This commit is contained in:
Niels Möller
2017-12-14 10:40:46 +01:00
committed by Commit Bot
parent 21eb9fc71c
commit 33fe1dfd3a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtc_base/checks.cc
View File

@ -47,6 +47,7 @@
#endif #endif
namespace rtc { namespace rtc {
namespace {
void VPrintError(const char* format, va_list args) { void VPrintError(const char* format, va_list args) {
#if defined(WEBRTC_ANDROID) #if defined(WEBRTC_ANDROID)
@ -56,6 +57,11 @@ void VPrintError(const char* format, va_list args) {
#endif #endif
} }
#if defined(__GNUC__)
void PrintError(const char* format, ...)
__attribute__((__format__(__printf__, 1, 2)));
#endif
void PrintError(const char* format, ...) { void PrintError(const char* format, ...) {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
@ -97,6 +103,8 @@ void DumpBacktrace() {
#endif #endif
} }
} // namespace
FatalMessage::FatalMessage(const char* file, int line) { FatalMessage::FatalMessage(const char* file, int line) {
Init(file, line); Init(file, line);
} }
@ -111,7 +119,7 @@ NO_RETURN FatalMessage::~FatalMessage() {
fflush(stdout); fflush(stdout);
fflush(stderr); fflush(stderr);
stream_ << std::endl << "#" << std::endl; stream_ << std::endl << "#" << std::endl;
PrintError(stream_.str().c_str()); PrintError("%s", stream_.str().c_str());
DumpBacktrace(); DumpBacktrace();
fflush(stderr); fflush(stderr);
abort(); abort();