diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 486fbef764a..9fa05d8b7f6 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -1285,6 +1285,9 @@ nsObjectFrame::HandleEvent(nsIPresContext& aPresContext, nsresult rv = NS_OK; //~~~ + //FIX FOR CRASHING WHEN NO INSTANCE OWVER + if (!mInstanceOwner) + return NS_ERROR_NULL_POINTER; #ifdef XP_WIN nsPluginWindow * window; mInstanceOwner->GetWindow(window); diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 486fbef764a..9fa05d8b7f6 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -1285,6 +1285,9 @@ nsObjectFrame::HandleEvent(nsIPresContext& aPresContext, nsresult rv = NS_OK; //~~~ + //FIX FOR CRASHING WHEN NO INSTANCE OWVER + if (!mInstanceOwner) + return NS_ERROR_NULL_POINTER; #ifdef XP_WIN nsPluginWindow * window; mInstanceOwner->GetWindow(window);