openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "libdebuggerd: fix out of bounds write." am: eb1b202acb 

am: 3c9ed98fce

Change-Id: If871552e36aa203ff431e9395d565bf6783b9b16
This commit is contained in:
Josh Gao 2018-04-20 21:08:28 -07:00 committed by android-build-merger
parent 15045aa79f 3c9ed98fce
commit 57af935f1f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debuggerd/libdebuggerd/tombstone.cpp
View File

@ -247,14 +247,13 @@ static void dump_abort_message(log_t* log, Memory* process_memory, uint64_t addr
length -= sizeof(size_t);
std::vector<char> msg(length);
// The abort message should be null terminated already, but reserve a spot for NUL just in case.
std::vector<char> msg(length + 1);
if (!process_memory->ReadFully(address + sizeof(length), &msg[0], length)) {
_LOG(log, logtype::HEADER, "Failed to read abort message: %s\n", strerror(errno));
return;
}
// The abort message should be null terminated already, but just in case...
msg[length] = '\0';
_LOG(log, logtype::HEADER, "Abort message: '%s'\n", &msg[0]);
}