mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-28 19:35:36 +02:00
Code Issues Wiki Activity

Patch for Devin Steffler.

Browse source 
Bug 97301  	flattenLocationsToFile returns null causing NPE in indexer
This commit is contained in:
John Camelon 2005-05-30 18:26:49 +00:00
parent 7f446a4ff5
commit 1a9c0d8eb7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
View file

@ -2585,15 +2585,16 @@ abstract class BaseScanner implements IScanner {
buffer, start, len)); buffer, start, len));
branchState(BRANCH_IF); branchState(BRANCH_IF);
processIf(pos, pos + start + len, true); // fix 86870, process IF before skipping the condition and only process it once
if (expressionEvaluator.evaluate(buffer, start, len, if (expressionEvaluator.evaluate(buffer, start, len,
definitions, definitions,
getLineNumber(bufferPos[bufferStackPos]), getLineNumber(bufferPos[bufferStackPos]),
getCurrentFilename()) == 0) { getCurrentFilename()) == 0) {
processIf(pos, bufferPos[bufferStackPos], true);
skipOverConditionalCode(true); skipOverConditionalCode(true);
if (isLimitReached()) if (isLimitReached())
handleInvalidCompletion(); handleInvalidCompletion();
} else {
processIf(pos, bufferPos[bufferStackPos], false);
} }
return; return;
case ppElse: case ppElse: