commit 8996590a615588dab107b84cdec2a70e8dd21d2c
author Josh Gao <jmgao@google.com> Thu Feb 16 04:00:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 16 04:00:11 2017 +0000
tree fd530b6005830a22cf3ca8b2b0ed3a7f15b92063
parent 5b67d87e2b769fd297ef2ab23f19f43f8713bf43
parent 13d264890ded1c08ae53ba4341088bd34c482866

debuggerd_handler: don't use snprintf in handler. am: 60515bf9f1 am: 021028e020 am: 7e26f7e0bb
am: df2192d259

Change-Id: I5a54370da4c600fdef92992f4c19c3f131cc9148

debuggerd/handler/debuggerd_handler.cpp

diff --git a/debuggerd/handler/debuggerd_handler.cpp b/debuggerd/handler/debuggerd_handler.cpp
index a5de83a..b1dc01a 100644
--- a/debuggerd/handler/debuggerd_handler.cpp
+++ b/debuggerd/handler/debuggerd_handler.cpp
@@ -81,7 +81,7 @@
   va_start(args, fmt);
 
   char buf[4096];
-  vsnprintf(buf, sizeof(buf), fmt, args);
+  __libc_format_buffer_va_list(buf, sizeof(buf), fmt, args);
   fatal("%s: %s", buf, strerror(err));
 }
 
@@ -256,8 +256,9 @@
 
     char main_tid[10];
     char pseudothread_tid[10];
-    snprintf(main_tid, sizeof(main_tid), "%d", thread_info->crashing_tid);
-    snprintf(pseudothread_tid, sizeof(pseudothread_tid), "%d", thread_info->pseudothread_tid);
+    __libc_format_buffer(main_tid, sizeof(main_tid), "%d", thread_info->crashing_tid);
+    __libc_format_buffer(pseudothread_tid, sizeof(pseudothread_tid), "%d", thread_info->pseudothread_tid);
+
     execl(CRASH_DUMP_PATH, CRASH_DUMP_NAME, main_tid, pseudothread_tid, nullptr);
 
     fatal_errno("exec failed");