mirror of https://github.com/keeweb/keeweb.git
fix #1817: crash on files with large attachments as KDBX3
This commit is contained in:
parent
379e28e8a4
commit
6627e8c0ec
|
@ -6,8 +6,8 @@ const ExpectedFieldRefByteLength = ExpectedFieldRefChars.length;
|
||||||
kdbxweb.ProtectedValue.prototype.isProtected = true;
|
kdbxweb.ProtectedValue.prototype.isProtected = true;
|
||||||
|
|
||||||
kdbxweb.ProtectedValue.prototype.forEachChar = function (fn) {
|
kdbxweb.ProtectedValue.prototype.forEachChar = function (fn) {
|
||||||
const value = this._value;
|
const value = this.value;
|
||||||
const salt = this._salt;
|
const salt = this.salt;
|
||||||
let b, b1, b2, b3;
|
let b, b1, b2, b3;
|
||||||
for (let i = 0, len = value.length; i < len; i++) {
|
for (let i = 0, len = value.length; i < len; i++) {
|
||||||
b = value[i] ^ salt[i];
|
b = value[i] ^ salt[i];
|
||||||
|
@ -154,7 +154,7 @@ kdbxweb.ProtectedValue.prototype.equals = function (other) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
for (let i = 0; i < len; i++) {
|
for (let i = 0; i < len; i++) {
|
||||||
if ((this._value[i] ^ this._salt[i]) !== (other._value[i] ^ other._salt[i])) {
|
if ((this.value[i] ^ this.salt[i]) !== (other.value[i] ^ other.salt[i])) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -181,8 +181,8 @@ kdbxweb.ProtectedValue.prototype.saltedValue = function () {
|
||||||
if (!this.byteLength) {
|
if (!this.byteLength) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
const value = this._value;
|
const value = this.value;
|
||||||
const salt = this._salt;
|
const salt = this.salt;
|
||||||
let salted = '';
|
let salted = '';
|
||||||
for (let i = 0, len = value.length; i < len; i++) {
|
for (let i = 0, len = value.length; i < len; i++) {
|
||||||
const byte = value[i] ^ salt[i];
|
const byte = value[i] ^ salt[i];
|
||||||
|
@ -193,8 +193,8 @@ kdbxweb.ProtectedValue.prototype.saltedValue = function () {
|
||||||
|
|
||||||
kdbxweb.ProtectedValue.prototype.dataAndSalt = function () {
|
kdbxweb.ProtectedValue.prototype.dataAndSalt = function () {
|
||||||
return {
|
return {
|
||||||
data: [...this._value],
|
data: [...this.value],
|
||||||
salt: [...this._salt]
|
salt: [...this.salt]
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@
|
||||||
"jquery": "3.6.0",
|
"jquery": "3.6.0",
|
||||||
"json-loader": "^0.5.7",
|
"json-loader": "^0.5.7",
|
||||||
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
|
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
|
||||||
"kdbxweb": "^2.0.1",
|
"kdbxweb": "^2.0.3",
|
||||||
"load-grunt-tasks": "5.1.0",
|
"load-grunt-tasks": "5.1.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"marked": "^2.0.3",
|
"marked": "^2.0.3",
|
||||||
|
@ -11706,9 +11706,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/kdbxweb": {
|
"node_modules/kdbxweb": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.3.tgz",
|
||||||
"integrity": "sha512-ewghBv4gAGkUgtPv+qELC7U+qA5U6msKYod4UDtCrrAA4taEm13VSdZGxp2iBeIhkh/bciHmRlvtVoSTlLL+1g==",
|
"integrity": "sha512-VKaYAQiTqxPmn55IcUDzdZsV1+1k4onBHe+Ip7t5xs7JxkGT++tmPwIFE+D3smzjTQ63fUEJ+P7t3o+xIbC/6A==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
|
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
|
||||||
"xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6"
|
"xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6"
|
||||||
|
@ -29846,9 +29846,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"kdbxweb": {
|
"kdbxweb": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.3.tgz",
|
||||||
"integrity": "sha512-ewghBv4gAGkUgtPv+qELC7U+qA5U6msKYod4UDtCrrAA4taEm13VSdZGxp2iBeIhkh/bciHmRlvtVoSTlLL+1g==",
|
"integrity": "sha512-VKaYAQiTqxPmn55IcUDzdZsV1+1k4onBHe+Ip7t5xs7JxkGT++tmPwIFE+D3smzjTQ63fUEJ+P7t3o+xIbC/6A==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
|
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
|
||||||
"xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6"
|
"xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6"
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
"jquery": "3.6.0",
|
"jquery": "3.6.0",
|
||||||
"json-loader": "^0.5.7",
|
"json-loader": "^0.5.7",
|
||||||
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
|
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
|
||||||
"kdbxweb": "^2.0.1",
|
"kdbxweb": "^2.0.3",
|
||||||
"load-grunt-tasks": "5.1.0",
|
"load-grunt-tasks": "5.1.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"marked": "^2.0.3",
|
"marked": "^2.0.3",
|
||||||
|
|
|
@ -2,6 +2,7 @@ Release notes
|
||||||
-------------
|
-------------
|
||||||
##### v1.18.5 (TBD)
|
##### v1.18.5 (TBD)
|
||||||
`-` fix #1816: old Chromium support, such as Android Edge
|
`-` fix #1816: old Chromium support, such as Android Edge
|
||||||
|
`-` fix #1817: crash on files with large attachments as KDBX3
|
||||||
|
|
||||||
##### v1.18.4 (2021-05-12)
|
##### v1.18.4 (2021-05-12)
|
||||||
`+` #1814: option to disable auto-type title filter by default
|
`+` #1814: option to disable auto-type title filter by default
|
||||||
|
|
Loading…
Reference in New Issue