From 84f0f6ba8b40378d0cf9fe743c75c1a58fc2bb41 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Mon, 29 Apr 2024 16:05:02 +0200 Subject: [PATCH] CMakePM: Fix crash with specific CMakePresets.json The code was not taking into consideration an empty QStringList. Fixes: QTCREATORBUG-30755 Change-Id: Ifb9f5dc3ffefd94d44b16b161bc04d381f3f6786 Reviewed-by: Alessandro Portale --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 23c68a6e642..9e119bba886 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -136,6 +136,8 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP && left.inherits.value().contains(right.name); const bool inheritsGreater = left.inherits && right.inherits + && !left.inherits.value().isEmpty() + && !right.inherits.value().isEmpty() && left.inherits.value().first() > right.inherits.value().first();