ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: e13efa6112

* commit 'e13efa61122cbad99dc10b9a89d1a06a6b6dc418':
  liblog: print message payload of zero length
This commit is contained in:
Mark Salyzyn 2015-12-08 00:39:06 +00:00 • committed by android-build-merger
commit 1f6a9473a7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
liblog/logprint.c
View file

@ -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;
}