mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-22 22:22:11 +02:00
Bug 549078 - ArrayOutOfBoundsException in AbstractIndexerTask.IndexFileContent.merge()
Change-Id: I7ceacfc9c14e10bdecf7dda3c793a3ed26559bc2
This commit is contained in:
parent
76b7b64307
commit
1ea6dac9af
1 changed files with 2 additions and 2 deletions
|
@ -283,10 +283,10 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
|
|||
int ioffset = getOffset(includes, i);
|
||||
int moffset = getOffset(macros, m);
|
||||
for (int k = 0; k < merged.length; k++) {
|
||||
if (ioffset <= moffset) {
|
||||
if (ioffset <= moffset && i < includes.length) {
|
||||
merged[k] = includes[i];
|
||||
ioffset = getOffset(includes, ++i);
|
||||
} else {
|
||||
} else if (m < macros.length) {
|
||||
merged[k] = macros[m];
|
||||
moffset = getOffset(macros, ++m);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue