Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 17:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1529495 - Move the call to LocalFree to a try-finally to guarantee we will free the memory even if an exception is thrown. r=MattN

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D20630

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jared Wein 2019-02-21 15:35:43 +00:00
parent 22bf6bb920
commit 9e7d408c7e
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
toolkit/components/passwordmgr/OSCrypto_win.js
View File

@ -170,20 +170,23 @@ OSCrypto.prototype = {
let outData = new this._structs.DATA_BLOB();
let entropyParam = this._getEntropyParam(entropy);
let status = this._functions.get("CryptUnprotectData")(inData.address(), null,
entropyParam,
null, null, FLAGS_NOT_SET,
outData.address());
if (status === 0) {
throw new Error("decryptData failed: " + ctypes.winLastError);
try {
let status = this._functions.get("CryptUnprotectData")(inData.address(), null,
entropyParam,
null, null, FLAGS_NOT_SET,
outData.address());
if (status === 0) {
throw new Error("decryptData failed: " + ctypes.winLastError);
}
let decrypted = this._convertWinArrayToJSArray(outData);
// Output that may include characters outside of the 0-255 (byte) range needs to use TextDecoder.
return (new TextDecoder()).decode(new Uint8Array(decrypted));
} finally {
if (outData.pbData) {
this._functions.get("LocalFree")(outData.pbData);
}
}
let decrypted = this._convertWinArrayToJSArray(outData);
let decryptedData = (new TextDecoder()).decode(new Uint8Array(decrypted));
// Output that may include characters outside of the 0-255 (byte) range needs to use TextDecoder.
this._functions.get("LocalFree")(outData.pbData);
return decryptedData;
},
/**
@ -202,18 +205,22 @@ OSCrypto.prototype = {
let outData = new this._structs.DATA_BLOB();
let entropyParam = this._getEntropyParam(entropy);
let status = this._functions.get("CryptProtectData")(inData.address(), null,
entropyParam,
null, null, FLAGS_NOT_SET,
outData.address());
if (status === 0) {
throw new Error("encryptData failed: " + ctypes.winLastError);
}
try {
let status = this._functions.get("CryptProtectData")(inData.address(), null,
entropyParam,
null, null, FLAGS_NOT_SET,
outData.address());
if (status === 0) {
throw new Error("encryptData failed: " + ctypes.winLastError);
}
let encrypted = this._convertWinArrayToJSArray(outData);
let encryptedData = this.arrayToString(encrypted);
this._functions.get("LocalFree")(outData.pbData);
return encryptedData;
let encrypted = this._convertWinArrayToJSArray(outData);
return this.arrayToString(encrypted);
} finally {
if (outData.pbData) {
this._functions.get("LocalFree")(outData.pbData);
}
}
},
/**