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

Commit 9d7d5e2b authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Add nullptr checks in NBLog::DumpReader::handleFormat"

parents 26f23259 9e01951b

media/libnblog/Reader.cpp

+9 −0
Original line number Diff line number Diff line
@@ -284,6 +284,15 @@ void DumpReader::dump(int fd, size_t indent) 
EntryIterator DumpReader::handleFormat(const FormatEntry &fmtEntry,

        String8 *timestamp, String8 *body)

{

    String8 timestampLocal;

    String8 bodyLocal;

    if (timestamp == nullptr) {

        timestamp = &timestampLocal;

    }

    if (body == nullptr) {

        body = &bodyLocal;

    }



    // log timestamp

    const int64_t ts = fmtEntry.timestamp();

    timestamp->clear();