Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lookup of incident section by name to not crash.

Browse Source 
Bug: 132890298
Test: adb shell incident asdfadfasdfadf doesn't crash
Change-Id: I74226960e8e2643df3491cd9dff8e9acc639e24f
This commit is contained in:
Joe Onorato
2019-05-19 20:51:47 -07:00
parent 5dfe3dfeb8
commit 3864a348de
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/incident/main.cpp
View File

@@ -133,11 +133,11 @@ static void section_list(FILE* out) {
static IncidentSection const*
find_section(const char* name)
{
size_t low = 0;
size_t high = INCIDENT_SECTION_COUNT - 1;
ssize_t low = 0;
ssize_t high = INCIDENT_SECTION_COUNT - 1;
while (low <= high) {
size_t mid = (low + high) >> 1;
ssize_t mid = (low + high) / 2;
IncidentSection const* section = INCIDENT_SECTIONS + mid;
int cmp = strcmp(section->name, name);
@@ -304,6 +304,7 @@ main(int argc, char** argv)
} else {
IncidentSection const* ic = find_section(arg);
if (ic == NULL) {
ALOGD("Invalid section: %s\n", arg);
fprintf(stderr, "Invalid section: %s\n", arg);
return 1;
}