Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Null check to avoid crashing on reentry to IncrementalScroll. (Bug 490461) r=roc a1.9.0.next=dveditz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@260469 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mats.palmgren%bredband.net 2010-06-14 22:00:37 +00:00
parent a51c2e22e5
commit e870ddba13
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/view/src/nsScrollPortView.cpp
View File

@ -729,6 +729,9 @@ nsScrollPortView::IncrementalScroll()
0); 0);
if (!thisView.IsAlive()) if (!thisView.IsAlive())
return; return;
// A nested ScrollTo() taking the synchronous path may have deleted
// |mSmoothScroll| so we need to null-check again. Bug 490461.
if (mSmoothScroll)
mSmoothScroll->mFrameIndex++; mSmoothScroll->mFrameIndex++;
} else { } else {
delete mSmoothScroll; delete mSmoothScroll;