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

CMake: Fix crash when opening project

Browse Source 
The CMakeBuildStep can be part of a deploy configuration, and then the
buildConfiguration() relies on the "active" build configuration.

That can be nullptr under some conditions, e.g. we got crash reports for
loading projects, where ProjectExplorer::Target::addConfigurationsFromMap
might either not restore any build configuration for some reason, or not
set an "active" one.

Restoring the deploy configurations in that same method afterwards, then
leads a call to baseEnvironment() of the deploy step (=CMakeBuildStep)
and a crash.

Change-Id: I763d9fdbc7a6055eac384e4c5040c3f7b245d3cb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Eike Ziller
2025-02-04 11:05:48 +01:00
parent 173a67f8a9
commit 4607ec52f5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -781,7 +781,8 @@ Environment CMakeBuildStep::baseEnvironment() const
ProjectExplorer::IDevice::ConstPtr devicePtr = BuildDeviceKitAspect::device(kit());
result = devicePtr ? devicePtr->systemEnvironment() : Environment::systemEnvironment();
}
buildConfiguration()->addToEnvironment(result);
if (buildConfiguration())
buildConfiguration()->addToEnvironment(result);
kit()->addToBuildEnvironment(result);
result.modify(project()->additionalEnvironment());
return result;