diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2013-04-30 12:27:48 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2013-04-30 12:27:48 +0000 |
| commit | 4f5e4bbdf775354433430fea4598ff3991442915 (patch) | |
| tree | 6f28572019f098dd7d3be603299fdf3cff35ef66 | |
| parent | 94d8b448e046f3976b13ab79130c389115754022 (diff) | |
| download | compiler-rt-4f5e4bbdf775354433430fea4598ff3991442915.tar.gz | |
asan/tsan: fix printf(), on the second pass it prints garbage and crashes on random pointer dereference
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@180784 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/sanitizer_common/sanitizer_printf.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/sanitizer_common/sanitizer_printf.cc b/lib/sanitizer_common/sanitizer_printf.cc index f1fb2b1fe..b49cf77a8 100644 --- a/lib/sanitizer_common/sanitizer_printf.cc +++ b/lib/sanitizer_common/sanitizer_printf.cc @@ -192,6 +192,8 @@ static void CallPrintfAndReportCallback(const char *str) { static void SharedPrintfCode(bool append_pid, const char *format, va_list args) { + va_list args2; + va_copy(args2, args); const int kLen = 16 * 1024; // |local_buffer| is small enough not to overflow the stack and/or violate // the stack limit enforced by TSan (-Wframe-larger-than=512). On the other @@ -205,6 +207,8 @@ static void SharedPrintfCode(bool append_pid, const char *format, // mmaped buffer. for (int use_mmap = 0; use_mmap < 2; use_mmap++) { if (use_mmap) { + va_end(args); + va_copy(args, args2); buffer = (char*)MmapOrDie(kLen, "Report"); buffer_size = kLen; } @@ -235,6 +239,7 @@ static void SharedPrintfCode(bool append_pid, const char *format, // If we had mapped any memory, clean up. if (buffer != local_buffer) UnmapOrDie((void *)buffer, buffer_size); + va_end(args2); } void Printf(const char *format, ...) { |