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

am 1ec1bbda: am 9a9b6357: Merge "Apparently, logd does need the NULs."

Browse Source 
* commit '1ec1bbda7f254266653a0db470f6e5d699a0cad1':
  Apparently, logd does need the NULs.
This commit is contained in:
Elliott Hughes
2015-02-05 20:31:06 +00:00
committed by Android Git Automerger
parent 78c9743de6 1ec1bbda7f
commit 4aa6d06d7b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libc/bionic/libc_logging.cpp
View File

@@ -513,9 +513,9 @@ static int __libc_write_log(int priority, const char* tag, const char* msg) {
vec[3].iov_base = &priority; vec[3].iov_base = &priority;
vec[3].iov_len = 1; vec[3].iov_len = 1;
vec[4].iov_base = const_cast<char*>(tag); vec[4].iov_base = const_cast<char*>(tag);
vec[4].iov_len = strlen(tag); vec[4].iov_len = strlen(tag) + 1;
vec[5].iov_base = const_cast<char*>(msg); vec[5].iov_base = const_cast<char*>(msg);
vec[5].iov_len = strlen(msg); vec[5].iov_len = strlen(msg) + 1;
#else #else
int main_log_fd = TEMP_FAILURE_RETRY(open("/dev/log/main", O_CLOEXEC | O_WRONLY)); int main_log_fd = TEMP_FAILURE_RETRY(open("/dev/log/main", O_CLOEXEC | O_WRONLY));
if (main_log_fd == -1) { if (main_log_fd == -1) {
@@ -530,9 +530,9 @@ static int __libc_write_log(int priority, const char* tag, const char* msg) {
vec[0].iov_base = &priority; vec[0].iov_base = &priority;
vec[0].iov_len = 1; vec[0].iov_len = 1;
vec[1].iov_base = const_cast<char*>(tag); vec[1].iov_base = const_cast<char*>(tag);
vec[1].iov_len = strlen(tag); vec[1].iov_len = strlen(tag) + 1;
vec[2].iov_base = const_cast<char*>(msg); vec[2].iov_base = const_cast<char*>(msg);
vec[2].iov_len = strlen(msg); vec[2].iov_len = strlen(msg) + 1;
#endif #endif
int result = TEMP_FAILURE_RETRY(writev(main_log_fd, vec, sizeof(vec) / sizeof(vec[0]))); int result = TEMP_FAILURE_RETRY(writev(main_log_fd, vec, sizeof(vec) / sizeof(vec[0])));