From 2c13db81d8d60187d1b39b072996347346da8fd8 Mon Sep 17 00:00:00 2001
From: "mjudge%netscape.com"
 <mjudge%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 28 Sep 1999 00:13:19 +0000
Subject: [PATCH] aproved leaf. reviews sfraser.  checking for null stopping
 crash

git-svn-id: svn://10.0.0.236/trunk@49164 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsObjectFrame.cpp       | 3 +++
 mozilla/layout/html/base/src/nsObjectFrame.cpp | 3 +++
 2 files changed, 6 insertions(+)

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);