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

Lexer: Fine-tune recent crash fix

Browse Source 
Use the original offset only in the one place where it is relevant.
This amends commit 8eac3fba80.

Fixes: QTCREATORBUG-24221
Change-Id: Idcfc5ecc8a76c875c4f2ca5890d0ba95ce52a6e9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Kandeler
2020-06-24 10:02:07 +02:00
parent 8b3e0d7122
commit 538b097756
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/cplusplus/pp-engine.cpp
View File

@@ -1856,7 +1856,8 @@ void Preprocessor::handleDefineDirective(PPToken *tk)
QByteArray Preprocessor::expand(PPToken *tk, PPToken *lastConditionToken) QByteArray Preprocessor::expand(PPToken *tk, PPToken *lastConditionToken)
{ {
unsigned line = tk->lineno; unsigned line = tk->lineno;
unsigned bytesBegin = tk->originalOffset(); unsigned bytesBegin = tk->bytesBegin();
const int originalOffset = tk->originalOffset();
unsigned utf16charsBegin = tk->utf16charsBegin(); unsigned utf16charsBegin = tk->utf16charsBegin();
PPToken lastTk; PPToken lastTk;
while (isContinuationToken(*tk)) { while (isContinuationToken(*tk)) {
@@ -1864,8 +1865,8 @@ QByteArray Preprocessor::expand(PPToken *tk, PPToken *lastConditionToken)
lex(tk); lex(tk);
} }
// Gather the exact spelling of the content in the source. // Gather the exact spelling of the content in the source.
QByteArray condition(m_state.m_source.mid(bytesBegin, lastTk.bytesBegin() + lastTk.bytes() QByteArray condition(m_state.m_source.mid(originalOffset, lastTk.originalOffset() + lastTk.bytes()
- bytesBegin)); - originalOffset));
// qDebug("*** Condition before: [%s]", condition.constData()); // qDebug("*** Condition before: [%s]", condition.constData());
QByteArray result; QByteArray result;