Make Attributes iterator throw NoSuchElementException

Once drained
jhy · Nov 23, 2023 · 4669e14 · 4669e14
1 parent 297ea4f
commit 4669e14
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/main/java/org/jsoup/nodes/Attributes.java b/src/main/java/org/jsoup/nodes/Attributes.java
@@ -17,6 +17,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
 import static org.jsoup.internal.Normalizer.lowerCase;
@@ -367,6 +368,7 @@ public boolean hasNext() {
             @Override
             public Attribute next() {
                 checkModified();
+                if (i >= size) throw new NoSuchElementException();
                 final Attribute attr = new Attribute(keys[i], (String) vals[i], Attributes.this);
                 i++;
                 return attr;

diff --git a/src/test/java/org/jsoup/nodes/AttributesTest.java b/src/test/java/org/jsoup/nodes/AttributesTest.java
@@ -7,6 +7,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -143,6 +144,29 @@ public void testIteratorSkipsInternal() {
         assertEquals(2, seen);
     }
 
+    @Test void iteratorThrows() {
+        Attributes attrs = new Attributes();
+        attrs.put("One", "one").put("Two", "two");
+
+        Iterator<Attribute> it = attrs.iterator();
+        int seen = 0;
+        while (it.hasNext()) {
+            it.next();
+            seen++;
+        }
+        assertFalse(it.hasNext());
+        assertEquals(2, seen);
+
+        boolean threw = false;
+        try {
+            Attribute next = it.next();
+            assertNotNull(next); // not hit
+        } catch (NoSuchElementException e) {
+            threw = true;
+        }
+        assertTrue(threw);
+    }
+
     @Test
     public void testListSkipsInternal() {
         Attributes a = new Attributes();