Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 688913 - Finalize statements in extensions/cookie and toolkit/components/contentprefs. r=mak.

Browse Source
This commit is contained in:
Rafael Ávila de Espíndola 2011-10-28 10:55:20 -04:00
parent 26931ef829
commit 1498c9fca4
2 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/cookie/nsPermissionManager.cpp
View File

@ -792,6 +792,12 @@ NS_IMETHODIMP nsPermissionManager::Observe(nsISupports *aSubject, const char *aT
} else {
RemoveAllFromMemory();
}
if (mDBConn) {
// Null the statements, this will finalize them.
mStmtInsert = nsnull;
mStmtDelete = nsnull;
mStmtUpdate = nsnull;
}
}
else if (!nsCRT::strcmp(aTopic, "profile-do-change")) {
// the profile has already changed; init the db from the new location

61
toolkit/components/contentprefs/nsContentPrefService.js
View File

@ -242,10 +242,67 @@ ContentPrefService.prototype = {
this._observerSvc.removeObserver(this, "private-browsing");
// Finalize statements which may have been used asynchronously.
if (this.__stmtSelectPref)
// FIXME(696499): put them in an object cache like other components.
if (this.__stmtSelectPrefID) {
this.__stmtSelectPrefID.finalize();
this.__stmtSelectPrefID = null;
}
if (this.__stmtSelectGlobalPrefID) {
this.__stmtSelectGlobalPrefID.finalize();
this.__stmtSelectGlobalPrefID = null;
}
if (this.__stmtInsertPref) {
this.__stmtInsertPref.finalize();
this.__stmtInsertPref = null;
}
if (this.__stmtInsertGroup) {
this.__stmtInsertGroup.finalize();
this.__stmtInsertGroup = null;
}
if (this.__stmtInsertSetting) {
this.__stmtInsertSetting.finalize();
this.__stmtInsertSetting = null;
}
if (this.__stmtSelectGroupID) {
this.__stmtSelectGroupID.finalize();
this.__stmtSelectGroupID = null;
}
if (this.__stmtSelectSettingID) {
this.__stmtSelectSettingID.finalize();
this.__stmtSelectSettingID = null;
}
if (this.__stmtSelectPref) {
this.__stmtSelectPref.finalize();
if (this.__stmtSelectGlobalPref)
this.__stmtSelectPref = null;
}
if (this.__stmtSelectGlobalPref) {
this.__stmtSelectGlobalPref.finalize();
this.__stmtSelectGlobalPref = null;
}
if (this.__stmtSelectPrefsByName) {
this.__stmtSelectPrefsByName.finalize();
this.__stmtSelectPrefsByName = null;
}
if (this.__stmtDeleteSettingIfUnused) {
this.__stmtDeleteSettingIfUnused.finalize();
this.__stmtDeleteSettingIfUnused = null;
}
if(this.__stmtSelectPrefs) {
this.__stmtSelectPrefs.finalize();
this.__stmtSelectPrefs = null;
}
if(this.__stmtDeleteGroupIfUnused) {
this.__stmtDeleteGroupIfUnused.finalize();
this.__stmtDeleteGroupIfUnused = null;
}
if (this.__stmtDeletePref) {
this.__stmtDeletePref.finalize();
this.__stmtDeletePref = null;
}
if (this.__stmtUpdatePref) {
this.__stmtUpdatePref.finalize();
this.__stmtUpdatePref = null;
}
// Delete references to XPCOM components to make sure we don't leak them
// (although we haven't observed leakage in tests). Also delete references