commit 299af4e1cbe0253d81221f4a1b46d4f38ea3bc63
author Mark Salyzyn <salyzyn@google.com> Tue Mar 28 15:00:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 28 15:00:38 2017 +0000
tree 6912c5d5c8276acae3c0231b32ca8a4fa5e0e93b
parent b62746bb4d730ed3d8d22af931d604abb08546e1
parent f521e071156d61ed1b14b502a3a25b909df5e0f5

Merge "logd: strip out empty trailing iovec"

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