diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-13 17:34:20 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-13 17:34:20 (GMT) |
| commit | 9a02a267021b4bced796ac73e1a69fd095883d15 (patch) | |
| tree | 9dc63032b5855a2bd195e71c8851dc82757fb8bf | |
| parent | 7d9d0efc7b0c68636034d332017bd840d5c29b01 (diff) | |
| parent | ab079ee6822c4ab151b0df8f9a529088607d3629 (diff) | |
| download | CMake-9a02a267021b4bced796ac73e1a69fd095883d15.zip CMake-9a02a267021b4bced796ac73e1a69fd095883d15.tar.gz CMake-9a02a267021b4bced796ac73e1a69fd095883d15.tar.bz2 | |
Merge topic 'property-link-depends-no-crash'
ab079ee Avoid crash when checking property compatibility without link info
92a2ab7 Avoid crash when checking property link dependencies without link info
| -rw-r--r-- | Source/cmTarget.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 9639cd8..e0d7fa4 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -4753,6 +4753,10 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget *tgt, || (!impliedByUse && !explicitlySet)); cmComputeLinkInformation *info = tgt->GetLinkInformation(config); + if(!info) + { + return propContent; + } const cmComputeLinkInformation::ItemVector &deps = info->GetItems(); bool propInitialized = explicitlySet; @@ -4893,6 +4897,10 @@ bool isLinkDependentProperty(cmTarget *tgt, const std::string &p, const char *config) { cmComputeLinkInformation *info = tgt->GetLinkInformation(config); + if(!info) + { + return false; + } const cmComputeLinkInformation::ItemVector &deps = info->GetItems(); |