feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Add assertions to CppRefactoringFile::{start,end}Of(AST *)

Browse Source 
I've seen this crash once with a null pointer.

Change-Id: I162e36155f030712f697da0bbf39ea5fef849db3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2023-12-07 18:01:24 +01:00
parent c7f88ced89
commit 1365ee7cb2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cppeditor/cpprefactoringchanges.cpp
View File

@@ -191,6 +191,7 @@ int CppRefactoringFile::startOf(unsigned index) const
int CppRefactoringFile::startOf(const AST *ast) const int CppRefactoringFile::startOf(const AST *ast) const
{ {
QTC_ASSERT(ast, return 0);
int firstToken = ast->firstToken(); int firstToken = ast->firstToken();
const int lastToken = ast->lastToken(); const int lastToken = ast->lastToken();
while (tokenAt(firstToken).generated() && firstToken < lastToken) while (tokenAt(firstToken).generated() && firstToken < lastToken)
@@ -207,6 +208,7 @@ int CppRefactoringFile::endOf(unsigned index) const
int CppRefactoringFile::endOf(const AST *ast) const int CppRefactoringFile::endOf(const AST *ast) const
{ {
QTC_ASSERT(ast, return 0);
int lastToken = ast->lastToken() - 1; int lastToken = ast->lastToken() - 1;
QTC_ASSERT(lastToken >= 0, return -1); QTC_ASSERT(lastToken >= 0, return -1);
const int firstToken = ast->firstToken(); const int firstToken = ast->firstToken();