From 17fd7a87d963498f8832292eb4e733c02b5fdb2c Mon Sep 17 00:00:00 2001 From: Randy Rohrbach Date: Fri, 23 Jan 2009 17:58:24 +0000 Subject: [PATCH] Bugzilla 262210 --- .../cdt/dsf/debug/model/DsfMemoryBlock.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java index 7f969a79fcc..53b89be4c30 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java @@ -334,9 +334,11 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens // Determine if any byte within the cell was modified boolean changed = false; for (int j = i; j < (i + 4) && j < length; j++) { - newBlock[j].setFlags(fBlock[distance + j].getFlags()); - if (newBlock[j].getValue() != fBlock[distance + j].getValue()) - changed = true; + if ( j < fBlock.length ) { + newBlock[j].setFlags(fBlock[distance + j].getFlags()); + if (newBlock[j].getValue() != fBlock[distance + j].getValue()) + changed = true; + } } // If so, flag the whole cell as modified if (changed) @@ -373,9 +375,11 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens // Determine if any byte within the cell was modified boolean changed = false; for (int j = i; j < (i + 4) && j < length; j++) { - newBlock[distance + j].setFlags(fBlock[j].getFlags()); - if (newBlock[distance + j].getValue() != fBlock[j].getValue()) - changed = true; + if ( j < fBlock.length ) { + newBlock[distance + j].setFlags(fBlock[j].getFlags()); + if (newBlock[distance + j].getValue() != fBlock[j].getValue()) + changed = true; + } } // If so, flag the whole cell as modified if (changed)