feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Elf reader: Fix asserts for 64 bit hosts.

Browse Source 
Change-Id: I624926a8ce09c6fbbb90fbd851f66c7cc65c4842
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Christian Kandeler
2012-06-11 14:57:46 +02:00
committed by hjk
parent e65b5b0c9f
commit 929bc18a7e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/elfreader.cpp
View File

@@ -226,7 +226,7 @@ ElfReader::Result ElfReader::readIt()
}
quint32 e_phentsize = getHalfWord(data, m_elfData);
QTC_CHECK(e_phentsize == (is64Bit ? 44 : 32));
QTC_CHECK(e_phentsize == (is64Bit ? 56 : 32));
quint32 e_phnum = getHalfWord(data, m_elfData);
quint32 e_shentsize = getHalfWord(data, m_elfData);
@@ -239,7 +239,7 @@ ElfReader::Result ElfReader::readIt()
quint32 e_shnum = getHalfWord(data, m_elfData);
quint32 e_shtrndx = getHalfWord(data, m_elfData);
QTC_CHECK(data == mapper.ustart + (is64Bit ? 58 : 52));
QTC_CHECK(data == mapper.ustart + (is64Bit ? 64 : 52));
if (quint64(e_shnum) * e_shentsize > fdlen) {
m_errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)")