From c4fd2231d1af375574fe7f977589b37fa9ca8d7d Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Fri, 8 Oct 1999 23:46:23 +0000 Subject: [PATCH] Bug 15178, r=vidur adding check for null-pointer avoiding crash git-svn-id: svn://10.0.0.236/trunk@50281 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 2486d3ce110..f3229d42f3e 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -1438,6 +1438,9 @@ extern nsresult NS_GetObjectFramePluginInstance(nsIFrame* aFrame, nsIPluginInsta nsresult NS_GetObjectFramePluginInstance(nsIFrame* aFrame, nsIPluginInstance*& aPluginInstance) { + if(aFrame == nsnull) + return NS_ERROR_NULL_POINTER; + // TODO: any way to determine this cast is safe? nsObjectFrame* objectFrame = NS_STATIC_CAST(nsObjectFrame*, aFrame); return objectFrame->GetPluginInstance(aPluginInstance); diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 2486d3ce110..f3229d42f3e 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -1438,6 +1438,9 @@ extern nsresult NS_GetObjectFramePluginInstance(nsIFrame* aFrame, nsIPluginInsta nsresult NS_GetObjectFramePluginInstance(nsIFrame* aFrame, nsIPluginInstance*& aPluginInstance) { + if(aFrame == nsnull) + return NS_ERROR_NULL_POINTER; + // TODO: any way to determine this cast is safe? nsObjectFrame* objectFrame = NS_STATIC_CAST(nsObjectFrame*, aFrame); return objectFrame->GetPluginInstance(aPluginInstance);