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

ElfReader: Catch bad_alloc exception

Browse Source 
Might happen on file.readAll() for large elf files.

Change-Id: Id338e647d2d0903d2071b5f35ffc7a00e6aca24d
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Orgad Shaneh
2014-11-24 14:46:32 +02:00
committed by hjk
parent 9a5f81d96f
commit d855afad44
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,8 @@
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
#include <new> // std::bad_alloc
namespace Utils { namespace Utils {
quint16 getHalfWord(const unsigned char *&s, const ElfData &context) quint16 getHalfWord(const unsigned char *&s, const ElfData &context)
@@ -113,7 +115,11 @@ bool ElfMapper::map()
ustart = file.map(0, fdlen); ustart = file.map(0, fdlen);
if (ustart == 0) { if (ustart == 0) {
// Try reading the data into memory instead. // Try reading the data into memory instead.
raw = file.readAll(); try {
raw = file.readAll();
} catch (std::bad_alloc &) {
return false;
}
start = raw.constData(); start = raw.constData();
fdlen = raw.size(); fdlen = raw.size();
} }