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

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

View File

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