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

Catch std::bad_alloc thrown by ElfReader on MinGW.

Browse Source 
Change-Id: Ide5445e1cf488c29be620287759147251bc7c26a
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-08-28 10:44:19 +02:00
committed by hjk
parent 81b431cdca
commit a8ba7054f5
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/debugger/moduleshandler.cpp
View File

@@ -228,19 +228,24 @@ void ModulesModel::removeModule(const QString &modulePath)
void ModulesModel::updateModule(const Module &module) void ModulesModel::updateModule(const Module &module)
{ {
const int row = indexOfModule(module.modulePath); const int row = indexOfModule(module.modulePath);
ElfReader reader(module.modulePath); try { // MinGW occasionallly throws std::bad_alloc.
ElfData elfData = reader.readHeaders(); ElfReader reader(module.modulePath);
ElfData elfData = reader.readHeaders();
if (row == -1) { if (row == -1) {
const int n = m_modules.size(); const int n = m_modules.size();
beginInsertRows(QModelIndex(), n, n); beginInsertRows(QModelIndex(), n, n);
m_modules.push_back(module); m_modules.push_back(module);
m_modules.back().elfData = elfData; m_modules.back().elfData = elfData;
endInsertRows(); endInsertRows();
} else { } else {
m_modules[row] = module; m_modules[row] = module;
m_modules[row].elfData = elfData; m_modules[row].elfData = elfData;
dataChanged(index(row, 0, QModelIndex()), index(row, 4, QModelIndex())); dataChanged(index(row, 0, QModelIndex()), index(row, 4, QModelIndex()));
}
} catch(...) {
qWarning("%s: An exception occurred while reading module '%s'",
Q_FUNC_INFO, qPrintable(module.modulePath));
} }
} }