Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f6a9473 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "liblog: print message payload of zero length" am: 50413c76

am: e13efa61

* commit 'e13efa61':
  liblog: print message payload of zero length
parents d6c9995d e13efa61
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -500,14 +500,14 @@ int android_log_processLogBuffer(struct logger_entry *buf,
    }
    if (msgEnd == -1) {
        /* incoming message not null-terminated; force it */
        msgEnd = buf->len - 1;
        msgEnd = buf->len - 1; /* may result in msgEnd < msgStart */
        msg[msgEnd] = '\0';
    }

    entry->priority = msg[0];
    entry->tag = msg + 1;
    entry->message = msg + msgStart;
    entry->messageLen = msgEnd - msgStart;
    entry->messageLen = (msgEnd < msgStart) ? 0 : (msgEnd - msgStart);

    return 0;
}