Fix potential issue with NbLexerCharStream(s) (#1969)

apache · Feb 26, 2020 · a837b79 · a837b79
1 parent 60d3983
commit a837b79
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ide/css.lib/src/org/netbeans/modules/css/lib/nblexer/NbLexerCharStream.java b/ide/css.lib/src/org/netbeans/modules/css/lib/nblexer/NbLexerCharStream.java
@@ -132,9 +132,9 @@ public void release(int marker) {
         }
 
         //remove all markers from the given one, including the requested one
-        for(int i = marker; i < markers.size(); i++) {
-            markers.remove(i);
-        }
+        do {
+            markers.pop();
+        } while (marker < markers.size());
     }
 
     @Override

diff --git a/...ommon/javascript2.lexer/src/org/netbeans/modules/javascript2/lexer/NbLexerCharStream.java b/...ommon/javascript2.lexer/src/org/netbeans/modules/javascript2/lexer/NbLexerCharStream.java
@@ -75,9 +75,9 @@ public void release(int marker) {
         }
 
         //remove all markers from the given one, including the requested one
-        for(int i = marker; i < markers.size(); i++) {
-            markers.remove(i);
-        }
+        do {
+            markers.pop();
+        } while (marker < markers.size());
     }
 
     @Override