commit 20a24403bc333cd92996cd43cef2e6a79c72d055
author Chris Dearman <chris@mips.com> Wed Oct 31 05:39:27 2012 -0700
committer Elliott Hughes <enh@google.com> Mon Nov 26 15:43:17 2012 -0800
tree 051f811859b2f7de25e89562e103120854bcc9a6
parent 429b05a1dfa71c6085590d60e0bdfa09beb50844

Do not include '\0' when writing error messages to stderr

Change-Id: I6adc806c3920e5a4ae61ca55c40613fcf338b18c
Signed-off-by: Chris Dearman <chris@mips.com>

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index fc54f3a..0d0a8a9 100755
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -146,7 +146,7 @@
     {                                                                           \
         const char* msg = "ERROR: " #name " called from the dynamic linker!\n"; \
          __libc_android_log_write(ANDROID_LOG_FATAL, "linker", msg);            \
-        write(2, msg, sizeof(msg));                                             \
+        write(2, msg, strlen(msg));                                             \
         abort();                                                                \
     }
 #define UNUSED __attribute__((unused))
@@ -1916,9 +1916,9 @@
     somain = si;
 
     if (!soinfo_link_image(si)) {
-        char errmsg[] = "CANNOT LINK EXECUTABLE\n";
+        const char* msg = "CANNOT LINK EXECUTABLE\n";
         write(2, __linker_dl_err_buf, strlen(__linker_dl_err_buf));
-        write(2, errmsg, sizeof(errmsg));
+        write(2, msg, strlen(msg));
         exit(EXIT_FAILURE);
     }