Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-09 04:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1102210 - crash in nsAndroidHistory, aLastVisitedURI can be null r=rnewman

Browse Source
This commit is contained in:
Mark Finkle 2014-11-21 13:28:04 -05:00
parent ad05a75474
commit 4bd286650d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/android/components/build/nsAndroidHistory.cpp
View File

@ -228,13 +228,6 @@ nsAndroidHistory::VisitURI(nsIURI *aURI, nsIURI *aLastVisitedURI, uint32_t aFlag
return NS_OK;
}
if (aFlags & VisitFlags::REDIRECT_SOURCE || aFlags & VisitFlags::REDIRECT_PERMANENT || aFlags & VisitFlags::REDIRECT_TEMPORARY) {
// aLastVisitedURI redirected to aURI. We want to ignore aLastVisitedURI,
// so remove the pending visit. We want to give aURI a chance to be saved,
// so don't return early.
RemovePendingVisitURI(aLastVisitedURI);
}
// Silently return if URI is something we shouldn't add to DB.
bool canAdd;
nsresult rv = CanAddURI(aURI, &canAdd);
@ -244,6 +237,15 @@ nsAndroidHistory::VisitURI(nsIURI *aURI, nsIURI *aLastVisitedURI, uint32_t aFlag
}
if (aLastVisitedURI) {
if (aFlags & VisitFlags::REDIRECT_SOURCE ||
aFlags & VisitFlags::REDIRECT_PERMANENT ||
aFlags & VisitFlags::REDIRECT_TEMPORARY) {
// aLastVisitedURI redirected to aURI. We want to ignore aLastVisitedURI,
// so remove the pending visit. We want to give aURI a chance to be saved,
// so don't return early.
RemovePendingVisitURI(aLastVisitedURI);
}
bool same;
rv = aURI->Equals(aLastVisitedURI, &same);
NS_ENSURE_SUCCESS(rv, rv);