From b88bf6796e72691d4e7b5e5f0659734fc9f9089a Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Thu, 16 Aug 2018 22:21:25 +1000 Subject: EXPORT_PROPERTIES: Add test for an undefined property The added test verifies that a property listed in EXPORT_PROPERTIES can be undefined. It confirms the crash recorded in issue #18260. --- Tests/RunCMake/export/ExportPropertiesUndefined.cmake | 11 +++++++++++ Tests/RunCMake/export/RunCMakeTest.cmake | 1 + 2 files changed, 12 insertions(+) create mode 100644 Tests/RunCMake/export/ExportPropertiesUndefined.cmake diff --git a/Tests/RunCMake/export/ExportPropertiesUndefined.cmake b/Tests/RunCMake/export/ExportPropertiesUndefined.cmake new file mode 100644 index 0000000..aa529f2 --- /dev/null +++ b/Tests/RunCMake/export/ExportPropertiesUndefined.cmake @@ -0,0 +1,11 @@ +enable_language(CXX) +add_library(foo empty.cpp) +set_target_properties(foo PROPERTIES + EXPORT_PROPERTIES "NotDefinedProp" +) +export(TARGETS foo FILE "${CMAKE_CURRENT_BINARY_DIR}/foo.cmake") +install(TARGETS foo EXPORT fooExport + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/Tests/RunCMake/export/RunCMakeTest.cmake b/Tests/RunCMake/export/RunCMakeTest.cmake index 10ced90..46bb1fc 100644 --- a/Tests/RunCMake/export/RunCMakeTest.cmake +++ b/Tests/RunCMake/export/RunCMakeTest.cmake @@ -8,3 +8,4 @@ run_cmake(NoExportSet) run_cmake(ForbiddenToExportInterfaceProperties) run_cmake(ForbiddenToExportImportedProperties) run_cmake(ForbiddenToExportPropertyWithGenExp) +run_cmake(ExportPropertiesUndefined) -- cgit v0.12 From dbd3e2c53d2fb0c19a08a0fe8780df5eb4f89476 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Thu, 16 Aug 2018 22:22:13 +1000 Subject: EXPORT_PROPERTIES: Prevent null dereference for undefined property Fixes: #18260 --- Source/cmExportFileGenerator.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 5f61571..9e6560f 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -1143,6 +1143,11 @@ bool cmExportFileGenerator::PopulateExportProperties( return false; } auto propertyValue = targetProperties.GetPropertyValue(prop); + if (propertyValue == nullptr) { + // Asked to export a property that isn't defined on the target. Do not + // consider this an error, there's just nothing to export. + continue; + } std::string evaluatedValue = cmGeneratorExpression::Preprocess( propertyValue, cmGeneratorExpression::StripAllGeneratorExpressions); if (evaluatedValue != propertyValue) { -- cgit v0.12