Merge "logd: strip out empty trailing iovec"

2017-03-28 15:00:36 +00:00 · 2017-03-28 15:00:36 +00:00 · 6b11faeb42
parent 8678872a00 479c8c2e42
commit 6b11faeb42
1 changed files with 3 additions and 1 deletions
--- a/logd/LogBufferElement.cpp
+++ b/logd/LogBufferElement.cpp
@ -235,7 +235,9 @@ log_time LogBufferElement::flushTo(SocketClient* reader, LogBuffer* parent,
    }
    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);