fix: check if form elements are iterable

duckduckgo · Aug 8, 2024 · 2b779cc · 2b779cc
1 parent a3bab7d
commit 2b779cc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/dist/autofill-debug.js b/dist/autofill-debug.js
diff --git a/dist/autofill.js b/dist/autofill.js
diff --git a/src/Form/Form.js b/src/Form/Form.js
@@ -400,13 +400,17 @@ class Form {
         } else {
             /** @type {Element[] | NodeList} */
             let foundInputs = []
-
-            if (this.form instanceof HTMLFormElement) {
+            // Some sites seem to be overriding `form.elements`, so we need to check if it's still iterable.
+            if (
+                this.form instanceof HTMLFormElement &&
+                this.form.elements != null &&
+                Symbol.iterator in Object(this.form.elements)
+            ) {
                 // For form elements we use .elements to catch fields outside the form itself using the form attribute.
                 // It also catches all elements when the markup is broken.
                 // We use .filter to avoid fieldset, button, textarea etc.
                 const formElements = [...this.form.elements].filter((el) => el.matches(selector))
-                // If there are not form elements, we try to look for all
+                // If there are no form elements, we try to look for all
                 // enclosed elements within the form.
                 foundInputs = formElements.length > 0
                     ? formElements

diff --git a/swift-package/Resources/assets/autofill-debug.js b/swift-package/Resources/assets/autofill-debug.js
diff --git a/swift-package/Resources/assets/autofill.js b/swift-package/Resources/assets/autofill.js