Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-12 02:31:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 267249. Don't null out mPrefs in nsDocShell::Destroy() (prefs is a service). This caused a crash on the aviary branch after 172962 landed. Also remove unnecessary null check now that we know mPrefs can't be null. r=dbaron@mozilla.org, sr=brendan@mozilla.org

Browse Source
This commit is contained in:
jst%mozilla.jstenback.com 2004-11-10 22:07:17 +00:00
parent d76959c6b9
commit 0d96026257
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
docshell/base/nsDocShell.cpp
View File

@ -3142,7 +3142,6 @@ nsDocShell::Destroy()
DestroyChildren();
mParentWidget = nsnull;
mPrefs = nsnull;
mCurrentURI = nsnull;
if (mScriptGlobal) {
@ -5780,23 +5779,21 @@ nsresult nsDocShell::DoChannelLoad(nsIChannel * aChannel,
case LOAD_NORMAL:
case LOAD_LINK:
// Set cache checking flags
if (mPrefs) {
PRInt32 prefSetting;
if (NS_SUCCEEDED
(mPrefs->
GetIntPref("browser.cache.check_doc_frequency",
&prefSetting))) {
switch (prefSetting) {
case 0:
loadFlags |= nsIRequest::VALIDATE_ONCE_PER_SESSION;
break;
case 1:
loadFlags |= nsIRequest::VALIDATE_ALWAYS;
break;
case 2:
loadFlags |= nsIRequest::VALIDATE_NEVER;
break;
}
PRInt32 prefSetting;
if (NS_SUCCEEDED
(mPrefs->
GetIntPref("browser.cache.check_doc_frequency",
&prefSetting))) {
switch (prefSetting) {
case 0:
loadFlags |= nsIRequest::VALIDATE_ONCE_PER_SESSION;
break;
case 1:
loadFlags |= nsIRequest::VALIDATE_ALWAYS;
break;
case 2:
loadFlags |= nsIRequest::VALIDATE_NEVER;
break;
}
}
break;