From 0237eda92913b0779b509bbb4500f1e842e35d0e Mon Sep 17 00:00:00 2001 From: Tamas Berghammer Date: Mon, 25 Apr 2016 15:51:45 +0000 Subject: Fix ARM attribute parsing for Android after rL267291 Differential revision: http://reviews.llvm.org/D19480 llvm-svn: 267422 --- lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp') diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp index 7d79010ae76..aadce11eee6 100644 --- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp +++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp @@ -1740,12 +1740,9 @@ ObjectFileELF::GetSectionHeaderInfo(SectionHeaderColl §ion_headers, { DataExtractor data; - if (sheader.sh_type != SHT_ARM_ATTRIBUTES) - continue; - if (section_size == 0 || set_data(data, sheader.sh_offset, section_size) != section_size) - continue; - - ParseARMAttributes(data, section_size, arch_spec); + if (sheader.sh_type == SHT_ARM_ATTRIBUTES && section_size != 0 && + set_data(data, sheader.sh_offset, section_size) == section_size) + ParseARMAttributes(data, section_size, arch_spec); } if (name == g_sect_name_gnu_debuglink) -- cgit v1.2.3