mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-12 18:55:38 +02:00
Code Issues Wiki Activity

Bug 516686 - ArrayIndexOutOfBoundsException in CPPASTLiteralExpression.computeStringLiteralSize()

Browse source 
Change-Id: I45ce05315c57847bf8ae784b2fe7569a72716894
This commit is contained in:
Nathan Ridge 2017-05-16 02:19:36 -04:00
parent b0cfef83db
commit 4412c851ab
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLiteralExpression.java
View file

@ -121,7 +121,13 @@ public class CPPASTLiteralExpression extends ASTNode implements ICPPASTLiteralEx
return fSuffix; return fSuffix;
} }
public void setSuffix(char[] suffix) { public void addSuffix(char[] suffix) {
setSuffix(suffix);
// Make sure fValue reflects the added suffix.
fValue = CharArrayUtils.concat(fValue, suffix);
}
private void setSuffix(char[] suffix) {
this.fSuffix = suffix; this.fSuffix = suffix;
} }

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
View file

@ -2005,7 +2005,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
return literalExprWithRange; return literalExprWithRange;
} }
IToken opName = consume(IToken.tIDENTIFIER); IToken opName = consume(IToken.tIDENTIFIER);
((CPPASTLiteralExpression) literalExprWithRange).setSuffix(opName.getCharImage()); ((CPPASTLiteralExpression) literalExprWithRange).addSuffix(opName.getCharImage());
setRange(literalExprWithRange, offset, opName.getEndOffset()); setRange(literalExprWithRange, offset, opName.getEndOffset());
} }
} }