commit 045b126d69df3795eae268e8ef9f97abf8c46d75
author Greg Hackmann <ghackmann@google.com> Mon Oct 15 14:22:09 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 15 14:22:09 2018 -0700
tree dd6a6fba46302af75b0fe54b117bdb7a51e353a0
parent 710072909a24bf33ac81ad0f64f96ff1c4b1fcb6
parent daf746b15507337bd451ccbbc092b56dc4780b72

Merge "fdsan: reset va_list between varargs traversals"
am: daf746b155

Change-Id: Id30f514ef17a56be8f2f7b037e314ff0dee073c2

libc/bionic/fdsan.cpp

diff --git a/libc/bionic/fdsan.cpp b/libc/bionic/fdsan.cpp
index 11ebf52..9a9fee2 100644
--- a/libc/bionic/fdsan.cpp
+++ b/libc/bionic/fdsan.cpp
@@ -188,6 +188,8 @@
     async_safe_fatal_va_list("fdsan", fmt, va);
   } else {
     async_safe_format_log_va_list(ANDROID_LOG_ERROR, "fdsan", fmt, va);
+    va_end(va);
+    va_start(va, fmt);
     size_t len =
         async_safe_format_buffer_va_list(abort_message.buf, sizeof(abort_message.buf), fmt, va);
     abort_message.size = len + sizeof(size_t);