commit 13d264890ded1c08ae53ba4341088bd34c482866
author Josh Gao <jmgao@google.com> Thu Feb 16 03:56:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 16 03:56:38 2017 +0000
tree 6dc7d0a733c26c62bae3760cab775c31c7c06cae
parent c0c577f7dae7eff4d07680b1e412ba1e9eec1fb3
parent b48038c1faf5abed5a9d5162058999d94d31f066

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

Change-Id: I1b4a30a85374a2874322804dbe5f1fa88d6799a3

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");