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

Merge "liblog: tests: crashes in logcat.descriptive"

Browse source
This commit is contained in:
Treehugger Robot 2017-05-12 21:58:20 +00:00 • committed by Gerrit Code Review
commit f218210f6e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
liblog/event_tag_map.cpp
View file

@ -297,9 +297,9 @@ static int scanTagLine(EventTagMap* map, const char*& pData, int lineNum) {
while (isspace(*cp) && (*cp != '\n')) ++cp; while (isspace(*cp) && (*cp != '\n')) ++cp;
const char* fmt = NULL; const char* fmt = NULL;
size_t fmtLen = 0; size_t fmtLen = 0;
if (*cp != '#') { if (*cp && (*cp != '#')) {
fmt = cp; fmt = cp;
while ((*cp != '\n') && (*cp != '#')) ++cp; while (*cp && (*cp != '\n') && (*cp != '#')) ++cp;
while ((cp > fmt) && isspace(*(cp - 1))) --cp; while ((cp > fmt) && isspace(*(cp - 1))) --cp;
fmtLen = cp - fmt; fmtLen = cp - fmt;
} }
@ -309,7 +309,7 @@ static int scanTagLine(EventTagMap* map, const char*& pData, int lineNum) {
// recorded for the same uid, but recording that // recorded for the same uid, but recording that
// unused detail in our database is too burdensome. // unused detail in our database is too burdensome.
bool verbose = true; bool verbose = true;
while ((*cp != '#') && (*cp != '\n')) ++cp; while (*cp && (*cp != '#') && (*cp != '\n')) ++cp;
if (*cp == '#') { if (*cp == '#') {
do { do {
++cp; ++cp;
@ -317,7 +317,7 @@ static int scanTagLine(EventTagMap* map, const char*& pData, int lineNum) {
verbose = !!fastcmp<strncmp>(cp, "uid=", strlen("uid=")); verbose = !!fastcmp<strncmp>(cp, "uid=", strlen("uid="));
} }
while (*cp != '\n') ++cp; while (*cp && (*cp != '\n')) ++cp;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "%d: %p: %.*s\n", lineNum, tag, (int)(cp - pData), pData); fprintf(stderr, "%d: %p: %.*s\n", lineNum, tag, (int)(cp - pData), pData);
#endif #endif