mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-24 23:49:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Genex: Diagnose invalid LINK_ONLY usage instead of crashing

Browse Source 
When `$<LINK_ONLY:...>` is used outside of linking we may evaluate it
without a `dagChecker`.  Do not dereference the NULL pointer and issue a
diagnostic instead.

Closes: #16287
This commit is contained in:
Brad King
2016-09-05 09:04:30 -04:00
parent f6428725bb
commit f6fd0abc5b
5 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmGeneratorExpressionNode.cxx
View File

@@ -672,15 +672,20 @@ static const struct LinkOnlyNode : public cmGeneratorExpressionNode
LinkOnlyNode() {}
std::string Evaluate(const std::vector<std::string>& parameters,
cmGeneratorExpressionContext* /*context*/,
const GeneratorExpressionContent* /*content*/,
cmGeneratorExpressionContext* context,
const GeneratorExpressionContent* content,
cmGeneratorExpressionDAGChecker* dagChecker) const
CM_OVERRIDE
{
if (!dagChecker) {
reportError(context, content->GetOriginalExpression(),
"$<LINK_ONLY:...> may only be used for linking");
return std::string();
}
if (!dagChecker->GetTransitivePropertiesOnly()) {
return parameters.front();
}
return "";
return std::string();
}
} linkOnlyNode;