diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/BasicTokenDuple.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/BasicTokenDuple.java
index 8a16c6c6055..8f8c442b5f1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/BasicTokenDuple.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/BasicTokenDuple.java
@@ -101,7 +101,7 @@ public class BasicTokenDuple implements ITokenDuple {
 		for( ;; ){
 		    if( token == last )
 		        break;
-		    if( startOfSegment == last.getNext() )
+		    if( startOfSegment == last.getNext() && startOfSegment.getType() != IToken.tEOC ) // for the EOC token, next points to itself
 		    {
 		    	startOfSegment = null;
 		    	break;