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

ModelEditor: catch all exceptions on loading/saving model files

Browse Source 
As reported in QTCREATORBUG-15256 an invalid model file crashes QtC on
loading the file. Not all exceptions were caught.

Change-Id: Ie2e75ba23d92482e1365664f64728422e2003b32
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Jochen Becher
2015-10-29 20:19:43 +01:00
parent 88bbf4d126
commit 9fc4396e11
3 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/modeleditor/modeldocument.cpp
View File

@@ -74,9 +74,8 @@ Core::IDocument::OpenResult ModelDocument::open(QString *errorString, const QStr
{
Q_UNUSED(fileName);
if (!load(errorString, realFileName))
return Core::IDocument::OpenResult::ReadError;
return Core::IDocument::OpenResult::Success;
OpenResult result = load(errorString, realFileName);
return result;
}
bool ModelDocument::save(QString *errorString, const QString &name, bool autoSave)
@@ -143,7 +142,7 @@ ExtDocumentController *ModelDocument::documentController() const
return d->documentController;
}
bool ModelDocument::load(QString *errorString, const QString &fileName)
Core::IDocument::OpenResult ModelDocument::load(QString *errorString, const QString &fileName)
{
d->documentController = ModelEditorPlugin::modelsManager()->createModel(this);
connect(d->documentController, &qmt::DocumentController::changed, this, &IDocument::changed);
@@ -151,13 +150,16 @@ bool ModelDocument::load(QString *errorString, const QString &fileName)
try {
d->documentController->loadProject(fileName);
setFilePath(Utils::FileName::fromString(d->documentController->getProjectController()->getProject()->getFileName()));
} catch (const qmt::Exception &ex) {
} catch (const qmt::FileNotFoundException &ex) {
*errorString = ex.getErrorMsg();
return false;
return OpenResult::ReadError;
} catch (const qmt::Exception &ex) {
*errorString = tr("Could not open \"%1\" for reading: %2.").arg(fileName).arg(ex.getErrorMsg());
return OpenResult::CannotHandle;
}
emit contentSet();
return true;
return OpenResult::Success;
}
} // namespace Internal