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

Fix crashes when no default profile is set

Browse Source 
* Handle 0 when calling createTarget to avoid the crashes in the first place
* Do not try to create/add targets for 0 profiles to avoid creator writing
  a warning to the console
* Fix possible crashes in debugger when no default profile is set.

Task-number: QTCREATORBUG-7695
Change-Id: I9afc8e29c8b859ad078dad794ef5017168daac78
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Tobias Hunger
2012-08-08 15:39:10 +02:00
parent 240e6a8ae5
commit cac2819838
7 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View File

@@ -158,8 +158,9 @@ bool AutotoolsProject::fromMap(const QVariantMap &map)
// Load the project tree structure.
evaluateBuildSystem();
if (!activeTarget())
addTarget(createTarget(ProfileManager::instance()->defaultProfile()));
Profile *defaultProfile = ProfileManager::instance()->defaultProfile();
if (!activeTarget() && defaultProfile)
addTarget(createTarget(defaultProfile));
return true;
}

5
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -539,8 +539,9 @@ bool CMakeProject::fromMap(const QVariantMap &map)
if (!Project::fromMap(map))
return false;
if (!activeTarget())
addTarget(createTarget(ProfileManager::instance()->defaultProfile()));
Profile *defaultProfile = ProfileManager::instance()->defaultProfile();
if (!activeTarget() && defaultProfile)
addTarget(createTarget(defaultProfile));
// We have a user file, but we could still be missing the cbp file
// or simply run createXml with the saved settings

3
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1317,7 +1317,8 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
return false;
}
DebuggerStartParameters sp;
fillParameters(&sp, ProfileManager::instance()->defaultProfile()->id());
Profile *defaultProfile = ProfileManager::instance()->defaultProfile();
fillParameters(&sp, defaultProfile ? defaultProfile->id() : Core::Id());
qulonglong pid = it->toULongLong();
if (pid) {
sp.startMode = AttachExternal;

2
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -877,7 +877,7 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
Target *target = runConfiguration->target();
Profile *profile = target ? target->profile() : ProfileManager::instance()->defaultProfile();
fillParameters(&sp, profile->id());
fillParameters(&sp, profile ? profile->id() : Core::Id());
sp.environment = rc->environment();
sp.workingDirectory = rc->workingDirectory();

5
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -429,8 +429,9 @@ bool GenericProject::fromMap(const QVariantMap &map)
if (!Project::fromMap(map))
return false;
if (!activeTarget())
addTarget(createTarget(ProfileManager::instance()->defaultProfile()));
Profile *defaultProfile = ProfileManager::instance()->defaultProfile();
if (!activeTarget() && defaultProfile)
addTarget(createTarget(defaultProfile));
// Sanity check: We need both a buildconfiguration and a runconfiguration!
QList<Target *> targetList = targets();

2
src/plugins/projectexplorer/project.cpp
View File

@@ -248,7 +248,7 @@ bool Project::supportsProfile(Profile *p) const
Target *Project::createTarget(Profile *p)
{
if (target(p))
if (!p || target(p))
return 0;
Target *t = new Target(this, p);

5
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -300,8 +300,9 @@ bool QmlProject::fromMap(const QVariantMap &map)
if (!Project::fromMap(map))
return false;
if (!activeTarget())
addTarget(createTarget(ProjectExplorer::ProfileManager::instance()->defaultProfile()));
ProjectExplorer::Profile *defaultProfile = ProjectExplorer::ProfileManager::instance()->defaultProfile();
if (!activeTarget() && defaultProfile)
addTarget(createTarget(defaultProfile));
refresh(Everything);
// FIXME workaround to guarantee that run/debug actions are enabled if a valid file exists