commit f521e071156d61ed1b14b502a3a25b909df5e0f5
author Mark Salyzyn <salyzyn@google.com> Wed Mar 22 14:58:53 2017 -0700
committer Mark Salyzyn <salyzyn@google.com> Mon Mar 27 15:49:24 2017 -0700
tree 09e1454a7f653dcff998e2d9472015ae9261ed73
parent 7be54d4594ef0bd830355aafd860aca7eabb83a8

logd: strip out empty trailing iovec

If the last buffer has zero length, strip it out of the iovec
issued to SocketClient::sendDatav().

Test: gTest liblog-unit-tests, logd-unit-tests, logcat-unit-tests
Bug: 36497967
Change-Id: I8fc585bbec63402d0e818ff4c620fdd7edcc38dc

logd/LogBufferElement.cpp

diff --git a/logd/LogBufferElement.cpp b/logd/LogBufferElement.cpp
index 81356fe..04a620c 100644
--- a/logd/LogBufferElement.cpp
+++ b/logd/LogBufferElement.cpp
@@ -235,7 +235,9 @@
     }
     iovec[1].iov_len = entry.len;
 
-    log_time retval = reader->sendDatav(iovec, 2) ? FLUSH_ERROR : mRealTime;
+    log_time retval = reader->sendDatav(iovec, 1 + (entry.len != 0))
+                          ? FLUSH_ERROR
+                          : mRealTime;
 
     if (buffer) free(buffer);