diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-02-01 16:17:01 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-02-01 16:44:59 -0800 |
| commit | 0d7937ab76d5880425b7c756dc4cbb441198a0a1 (patch) | |
| tree | 0ce4a569615160edea08b8b12bb2719414863b41 /debuggerd | |
| parent | 0d7baec78e0d4bf0bfed5fa5c898ad859427f11e (diff) | |
| parent | 1435a02f4d8fe43a123d8ee6ae470b8e7df78eae (diff) | |
| download | system_core-0d7937ab76d5880425b7c756dc4cbb441198a0a1.zip system_core-0d7937ab76d5880425b7c756dc4cbb441198a0a1.tar.gz system_core-0d7937ab76d5880425b7c756dc4cbb441198a0a1.tar.bz2 | |
Merge tag 'android-6.0.1_r13' into 13.0
Android 6.0.1 release 13
Ticket: CYNGNOS-1522
Change-Id: I545ab024197c1a9f29111a120dd6281a74036c8c
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/elf_utils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debuggerd/elf_utils.cpp b/debuggerd/elf_utils.cpp index 5ea03e7..65c1904 100644 --- a/debuggerd/elf_utils.cpp +++ b/debuggerd/elf_utils.cpp @@ -63,10 +63,10 @@ static bool get_build_id( if (nhdr.n_type == NT_GNU_BUILD_ID) { // Skip the name (which is the owner and should be "GNU"). addr += NOTE_ALIGN(nhdr.n_namesz); - uint8_t build_id_data[128]; - if (nhdr.n_namesz > sizeof(build_id_data)) { - ALOGE("Possible corrupted note, name size value is too large: %u", - nhdr.n_namesz); + uint8_t build_id_data[160]; + if (nhdr.n_descsz > sizeof(build_id_data)) { + ALOGE("Possible corrupted note, desc size value is too large: %u", + nhdr.n_descsz); return false; } if (backtrace->Read(addr, build_id_data, nhdr.n_descsz) != nhdr.n_descsz) { |