From 9b9daa296e860eda19fd8262b8be579e781c59b2 Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Wed, 16 Feb 2000 01:49:42 +0000 Subject: [PATCH] Added check for null pointer to avoid possible crashes, could be reason for 27558 git-svn-id: svn://10.0.0.236/trunk@61012 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsObjectFrame.cpp | 5 ++++- mozilla/layout/html/base/src/nsObjectFrame.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index facbbaa56a3..e264b8a0fbd 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -1344,7 +1344,10 @@ nsresult nsObjectFrame::GetFullURL(nsIURI*& aFullURL) nsresult nsObjectFrame::GetPluginInstance(nsIPluginInstance*& aPluginInstance) { - return mInstanceOwner->GetInstance(aPluginInstance); + if(mInstanceOwner == nsnull) + return NS_ERROR_NULL_POINTER; + else + return mInstanceOwner->GetInstance(aPluginInstance); } nsresult diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index facbbaa56a3..e264b8a0fbd 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -1344,7 +1344,10 @@ nsresult nsObjectFrame::GetFullURL(nsIURI*& aFullURL) nsresult nsObjectFrame::GetPluginInstance(nsIPluginInstance*& aPluginInstance) { - return mInstanceOwner->GetInstance(aPluginInstance); + if(mInstanceOwner == nsnull) + return NS_ERROR_NULL_POINTER; + else + return mInstanceOwner->GetInstance(aPluginInstance); } nsresult