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

Commit 9a07a07e authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "liblog: accept log messages with hdr_size greater than known headers" 

am: d596ed66

Change-Id: I1b5b7b737f7c0dec9394fc6bd83f3fa2bd1b22f5
parents 77fb48d9 d596ed66

liblog/include/log/log_read.h

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ struct log_msg { 
  }

  char* msg() {

    unsigned short hdr_size = entry.hdr_size;

    if (hdr_size != sizeof(entry)) {

    if (hdr_size >= sizeof(struct log_msg) - sizeof(entry)) {

      return nullptr;

    }

    return reinterpret_cast<char*>(buf) + hdr_size;

liblog/logger_read.cpp

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,8 @@ int android_logger_list_read(struct logger_list* logger_list, struct log_msg* lo 
    return -EINVAL;

  }



  if (log_msg->entry.hdr_size != sizeof(log_msg->entry)) {

  if (log_msg->entry.hdr_size < sizeof(log_msg->entry) ||

      log_msg->entry.hdr_size >= sizeof(struct log_msg) - sizeof(log_msg->entry)) {

    return -EINVAL;

  }