From cb75dd05ea34e4554e2247bfca98e55f3c2d2e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Thu, 9 Apr 2009 11:00:40 +0200
Subject: [PATCH] Prevent endless loop when no matching brace is found
Would show up when typing ")," where the closing brace doesn't have a
matching opening brace, for example.
Done with Roberto Raggi.
---
src/libs/cplusplus/ExpressionUnderCursor.cpp | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/libs/cplusplus/ExpressionUnderCursor.cpp b/src/libs/cplusplus/ExpressionUnderCursor.cpp
index 9cbaeb97539..53dc9b4f2d1 100644
--- a/src/libs/cplusplus/ExpressionUnderCursor.cpp
+++ b/src/libs/cplusplus/ExpressionUnderCursor.cpp
@@ -265,9 +265,14 @@ int ExpressionUnderCursor::startOfFunctionCall(const QTextCursor &cursor)
break;
else if (tk.is(T_LPAREN))
return startPosition + tk.position();
- else if (tk.is(T_RPAREN))
- index = startOfMatchingBrace(tokens, index);
- else
+ else if (tk.is(T_RPAREN)) {
+ int matchingBrace = startOfMatchingBrace(tokens, index);
+
+ if (matchingBrace == index) // If no matching brace found
+ return -1;
+
+ index = matchingBrace;
+ } else
--index;
}
--
GitLab