Merge pull request #1206 from keepassxreboot/fix/add_missing_checks_for_stringfields

Sami Vänttinen · web-flow · commit 32dd3b1fc887 · 2021-02-04T07:06:25.000+02:00
Add missing checks for StringFields
diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js
@@ -941,7 +941,7 @@ kpxc.fillInCredentials = async function(combination, predefinedUsername, uuid, p
     }
 
     // Fill StringFields
-    if (selectedCredentials.stringFields.length > 0) {
+    if (selectedCredentials.stringFields && selectedCredentials.stringFields.length > 0) {
         kpxc.fillInStringFields(combination.fields, selectedCredentials.stringFields);
     }
 
@@ -1502,7 +1502,7 @@ kpxc.updateTOTPList = async function() {
         const password = kpxc.credentials[index].password;
 
         // If no username is set, compare with a password
-        const credentialList = kpxc.credentials.filter(c => (c.totp || c.stringFields.some(s => s['KPH: {TOTP}']))
+        const credentialList = kpxc.credentials.filter(c => (c.totp || (c.stringFields && c.stringFields.some(s => s['KPH: {TOTP}'])))
             && (c.login === username || (!username && c.password === password)));
 
         // Filter TOTP Autocomplete Menu with matching 2FA credentials

Original file line number	Diff line number	Diff line change
`@@ -941,7 +941,7 @@ kpxc.fillInCredentials = async function(combination, predefinedUsername, uuid, p`
`941`	`941`	`}`
`942`	`942`
`943`	`943`	`// Fill StringFields`
`944`		`- if (selectedCredentials.stringFields.length > 0) {`
	`944`	`+ if (selectedCredentials.stringFields && selectedCredentials.stringFields.length > 0) {`
`945`	`945`	`kpxc.fillInStringFields(combination.fields, selectedCredentials.stringFields);`
`946`	`946`	`}`
`947`	`947`
`@@ -1502,7 +1502,7 @@ kpxc.updateTOTPList = async function() {`
`1502`	`1502`	`const password = kpxc.credentials[index].password;`
`1503`	`1503`
`1504`	`1504`	`// If no username is set, compare with a password`
`1505`		`- const credentialList = kpxc.credentials.filter(c => (c.totp \|\| c.stringFields.some(s => s['KPH: {TOTP}']))`
	`1505`	`+ const credentialList = kpxc.credentials.filter(c => (c.totp \|\| (c.stringFields && c.stringFields.some(s => s['KPH: {TOTP}'])))`
`1506`	`1506`	`&& (c.login === username \|\| (!username && c.password === password)));`
`1507`	`1507`
`1508`	`1508`	`// Filter TOTP Autocomplete Menu with matching 2FA credentials`