generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Change-Id: I6adc806c3920e5a4ae61ca55c40613fcf338b18c
Signed-off-by: Chris Dearman <chris@mips.com>
This commit is contained in:
Chris Dearman 2012-10-31 05:39:27 -07:00 committed by Elliott Hughes
parent 429b05a1df
commit 20a24403bc
1 changed files with 3 additions and 3 deletions

6
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);
}