From a092cc2d3456fb48b3eb53520d52dba85e836dc2 Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com"
 <sspitzer%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 15 Jun 2000 21:20:19 +0000
Subject: [PATCH] workaround for smoketest blocker #42686 now we assert and
 gracefully continue, instead of crashing. I'll go give this bug to a better
 owner.  a=brade, r=mscott

git-svn-id: svn://10.0.0.236/trunk@72323 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/view/src/nsScrollPortView.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mozilla/view/src/nsScrollPortView.cpp b/mozilla/view/src/nsScrollPortView.cpp
index b9722223089..2250de53644 100644
--- a/mozilla/view/src/nsScrollPortView.cpp
+++ b/mozilla/view/src/nsScrollPortView.cpp
@@ -249,6 +249,8 @@ NS_IMETHODIMP nsScrollPortView::ScrollTo(nscoord aX, nscoord aY, PRUint32 aUpdat
 
     // make sure the new position in in bounds
 	GetScrolledView(scrolledView);
+	NS_ASSERTION(scrolledView, "no scrolled view");
+	if (!scrolledView) return NS_ERROR_FAILURE;
 	scrolledView->GetDimensions(&scrolledSize.width, &scrolledSize.height);
 
     nsSize portSize;