From a8f91395f9a2ee9d975a83178abaac9af34969ab Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Mon, 19 Nov 2018 11:52:24 -0800
Subject: ART: Fix clang-analyzer-security.insecureAPI.strcpy

Bug: 32619234
Test: m test-art-host
Change-Id: I08ef95679230be1cfd23037c15714e2720be358f
---
 dt_fd_forward/Android.bp       | 1 +
 dt_fd_forward/dt_fd_forward.cc | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'dt_fd_forward')

diff --git a/dt_fd_forward/Android.bp b/dt_fd_forward/Android.bp
index 1ba2323a15..2a2aa188bb 100644
--- a/dt_fd_forward/Android.bp
+++ b/dt_fd_forward/Android.bp
@@ -41,6 +41,7 @@ cc_defaults {
     header_libs: [
         "javavm_headers",
         "dt_fd_forward_export",
+        "art_libartbase_headers",  // For strlcpy emulation.
     ],
     multilib: {
         lib32: {
diff --git a/dt_fd_forward/dt_fd_forward.cc b/dt_fd_forward/dt_fd_forward.cc
index a99f7850c0..d5b6de5ead 100644
--- a/dt_fd_forward/dt_fd_forward.cc
+++ b/dt_fd_forward/dt_fd_forward.cc
@@ -50,6 +50,8 @@
 #include <jni.h>
 #include <jdwpTransport.h>
 
+#include <base/strlcpy.h>
+
 namespace dt_fd_forward {
 
 // Helper that puts line-number in error message.
@@ -651,7 +653,7 @@ void FdForwardTransport::Free(void* data) {
 jdwpTransportError FdForwardTransport::GetLastError(/*out*/char** err) {
   std::string data = global_last_error_;
   *err = reinterpret_cast<char*>(Alloc(data.size() + 1));
-  strcpy(*err, data.c_str());
+  strlcpy(*err, data.c_str(), data.size() + 1);
   return OK;
 }
 
-- 
cgit v1.2.3-59-g8ed1b