commit 44a28eabdf3e6a14c30ee7165d35b71a9b0f8c5d
author Josh Gao <jmgao@google.com> Thu Feb 16 03:50:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 16 03:50:13 2017 +0000
tree 8934cd8f026ae93da8dec2c83c77bd3c0dc3dfae
parent 9384123de112a7c04e6978a6430ac4212b4dd149
parent 04dfedbcacd2d5f05744ddbda6055a57959de8f6

debuggerd_handler: don't use snprintf in handler.
am: 60515bf9f1

Change-Id: I2407ec35721a3365609d33b2b1531c5fb0b0d7c9

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