fix: NPE in iterator usage

Col-E · Jul 24, 2020 · 3761119 · 3761119
1 parent 398d6bc
commit 3761119
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>me.coley</groupId>
     <artifactId>cafedude</artifactId>
     <url>https://github.com/Col-E/CAFED00D/</url>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <name>CAFED00D</name>
 
     <properties>

diff --git a/src/main/java/me/coley/cafedude/ConstPool.java b/src/main/java/me/coley/cafedude/ConstPool.java
@@ -93,7 +93,7 @@ public int size() {
 	public int indexOf(ConstPoolEntry entry) {
 		CpIter it = (CpIter) iterator();
 		ConstPoolEntry itEntry = null;
-		while ((itEntry = it.next()) != null) {
+		while (it.hasNext() && (itEntry = it.next()) != null) {
 			if (entry.equals(itEntry))
 				return it.currentIndex();
 		}
@@ -110,7 +110,7 @@ public int indexOf(ConstPoolEntry entry) {
 	public void removeIf(Predicate<ConstPoolEntry> filter) {
 		CpIter it = (CpIter) iterator();
 		ConstPoolEntry entry = null;
-		while ((entry = it.next()) != null) {
+		while (it.hasNext() && (entry = it.next()) != null) {
 			if (filter.test(entry))
 				it.remove();
 		}
@@ -127,7 +127,7 @@ public void removeIf(Predicate<ConstPoolEntry> filter) {
 	public void replaceIf(Predicate<ConstPoolEntry> filter, Function<ConstPoolEntry, ConstPoolEntry> replacer) {
 		CpIter it = (CpIter) iterator();
 		ConstPoolEntry entry = null;
-		while ((entry = it.next()) != null) {
+		while (it.hasNext() && (entry = it.next()) != null) {
 			if (filter.test(entry))
 				it.replace(replacer.apply(entry));
 		}