commit fe0bd9f6450860e88633944504cea823a95f3f17
author Mark Salyzyn <salyzyn@google.com> Tue Mar 28 15:22:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 28 15:22:16 2017 +0000
tree 4a751eb330e38e82d154edb4bc41a9ad7522d515
parent 7cc47ae36fa9f7d9f3c3077c3dd40078aa7ba849
parent 125dea5484912724f40f1c9b0a99abacb6ccbeea

Merge "logd: strip out empty trailing iovec" am: 6b11faeb42 am: d749a054ff am: 657ae57bf3
am: 046855b551

Change-Id: I20d92336df9edb9082a0bfb4dc59d3423fea9ed9

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