diff options
author | Brad King <brad.king@kitware.com> | 2021-02-22 15:39:22 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-22 15:39:30 (GMT) |
commit | db4a4b9e7a581f5df12e56a506247819af02e4e8 (patch) | |
tree | 0776d9ba870f454fc0046ad4e5365312d75e7919 /Source | |
parent | b473a9ce1a59f585ae53c58cc862cc37eaff07fe (diff) | |
parent | 90c2f138ee27ad7b36c058e9e791b6359793f58b (diff) | |
download | CMake-db4a4b9e7a581f5df12e56a506247819af02e4e8.zip CMake-db4a4b9e7a581f5df12e56a506247819af02e4e8.tar.gz CMake-db4a4b9e7a581f5df12e56a506247819af02e4e8.tar.bz2 |
Merge topic 'cpackifw-scanbuild-fix'
90c2f138ee CPackIFWInstaller: Avoid potential null pointer dereference
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5832
Diffstat (limited to 'Source')
-rw-r--r-- | Source/CPack/IFW/cmCPackIFWInstaller.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index e0dd06b..bf8b457 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -186,13 +186,20 @@ void cmCPackIFWInstaller::ConfigureFromOptions() this->WizardShowPageList.clear(); } } else { + std::string currentVersionMsg; + if (this->Generator) { + currentVersionMsg = + "QtIFW version " + this->Generator->FrameworkVersion; + } else { + currentVersionMsg = "an older QtIFW version"; + } cmCPackIFWLogger( WARNING, "Option CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST is set to \"" << option << "\", but it is only supported with QtIFW version 4.0 or later. " - "It is being ignored because you are using QtIFW version " - << this->Generator->FrameworkVersion.data() << std::endl); + "It is being ignored because you are using " + << currentVersionMsg << std::endl); } } |