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

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

Merge "logd: identical check access message data out of range" 

am: 887d74b4

Change-Id: I81a8f1ae6ea5560d30c92c73cce9825505a56cbd
parents 9a3421a1 887d74b4

logd/LogBuffer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -171,7 +171,9 @@ static enum match_type identical(LogBufferElement* elem, 
    }



    // audit message (except sequence number) identical?

    if (last->isBinary()) {

    if (last->isBinary() &&

        (lenl > static_cast<ssize_t>(sizeof(android_log_event_string_t))) &&

        (lenr > static_cast<ssize_t>(sizeof(android_log_event_string_t)))) {

        if (fastcmp<memcmp>(msgl, msgr, sizeof(android_log_event_string_t) -

                                            sizeof(int32_t))) {

            return DIFFERENT;