From 1365ee7cb2be79912a3de995e71f45a1e344e4ab Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 7 Dec 2023 18:01:24 +0100 Subject: [PATCH] CppEditor: Add assertions to CppRefactoringFile::{start,end}Of(AST *) I've seen this crash once with a null pointer. Change-Id: I162e36155f030712f697da0bbf39ea5fef849db3 Reviewed-by: Qt CI Bot Reviewed-by: Reviewed-by: Christian Stenger --- src/plugins/cppeditor/cpprefactoringchanges.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/cppeditor/cpprefactoringchanges.cpp b/src/plugins/cppeditor/cpprefactoringchanges.cpp index f4bcc471ad8..bf6faa7733b 100644 --- a/src/plugins/cppeditor/cpprefactoringchanges.cpp +++ b/src/plugins/cppeditor/cpprefactoringchanges.cpp @@ -191,6 +191,7 @@ int CppRefactoringFile::startOf(unsigned index) const int CppRefactoringFile::startOf(const AST *ast) const { + QTC_ASSERT(ast, return 0); int firstToken = ast->firstToken(); const int lastToken = ast->lastToken(); while (tokenAt(firstToken).generated() && firstToken < lastToken) @@ -207,6 +208,7 @@ int CppRefactoringFile::endOf(unsigned index) const int CppRefactoringFile::endOf(const AST *ast) const { + QTC_ASSERT(ast, return 0); int lastToken = ast->lastToken() - 1; QTC_ASSERT(lastToken >= 0, return -1); const int firstToken = ast->firstToken();