diff options
| author | Markus Schorn | 2008-05-30 11:13:33 +0000 |
|---|---|---|
| committer | Markus Schorn | 2008-05-30 11:13:33 +0000 |
| commit | 7e1f9c87fc2ae7886156613a95802eb902665efc (patch) | |
| tree | 7b329301958df9e69ef67f48402ffe80a476aea6 /core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler | |
| parent | 1b0953a43484994b3ee7174fbf73c39dd162ee38 (diff) | |
| download | org.eclipse.cdt-7e1f9c87fc2ae7886156613a95802eb902665efc.tar.gz org.eclipse.cdt-7e1f9c87fc2ae7886156613a95802eb902665efc.tar.xz org.eclipse.cdt-7e1f9c87fc2ae7886156613a95802eb902665efc.zip | |
Fixes for refactoring by Guido Zgraggen and Lukas Felber, bug 234783, 234786 and 234791.
Diffstat (limited to 'core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler')
| -rw-r--r-- | core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/NodeCommenter.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/NodeCommenter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/NodeCommenter.java index 7e76048eeab..3cae3e20ea0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/NodeCommenter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/NodeCommenter.java @@ -159,8 +159,13 @@ public class NodeCommenter { int length = OffsetHelper.getNodeOffset(com)-OffsetHelper.getNodeEndPoint(node); byte[] b = new byte[length]; - is.skip(OffsetHelper.getNodeEndPoint(node)); - is.read(b, 0, length); + long count = is.skip(OffsetHelper.getEndOffsetWithoutComments(node)); + if(count < OffsetHelper.getEndOffsetWithoutComments(node)) { + return false; + } + if(is.read(b, 0, length) == -1) { + return false; + } for(byte bb : b) { if(!Character.isWhitespace(bb)) { |