From 20a24403bc333cd92996cd43cef2e6a79c72d055 Mon Sep 17 00:00:00 2001 From: Chris Dearman Date: Wed, 31 Oct 2012 05:39:27 -0700 Subject: [PATCH] Do not include '\0' when writing error messages to stderr Change-Id: I6adc806c3920e5a4ae61ca55c40613fcf338b18c Signed-off-by: Chris Dearman --- linker/linker.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linker/linker.cpp b/linker/linker.cpp index fc54f3ace..0d0a8a901 100755 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -146,7 +146,7 @@ static unsigned bitmask[4096]; { \ 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 @@ static unsigned __linker_init_post_relocation(unsigned **elfdata, unsigned linke 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); }