Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #156936, regression: crash using OBJECT tag with any plugin, r=peterl, sr=jag

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@125027 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
serge%netscape.com 2002-07-11 19:32:44 +00:00
parent 7b9f5c6894
commit 0eb5cb3c29
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/layout/generic/nsObjectFrame.cpp
View File

@ -2363,8 +2363,8 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetDocument(nsIDocument* *aDocument)
if (nsnull != mContext) {
nsCOMPtr<nsIPresShell> shell;
mContext->GetShell(getter_AddRefs(shell));
rv = shell->GetDocument(aDocument);
if (shell)
rv = shell->GetDocument(aDocument);
}
return rv;
}
@ -3014,10 +3014,11 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
nsAutoString data;
nsCOMPtr<nsIAtom> tag;
content->GetTag(*getter_AddRefs(tag));
if (nsHTMLAtoms::object == tag.get() &&
!content->HasAttr(kNameSpaceID_None, nsHTMLAtoms::src) &&
NS_SUCCEEDED(content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data)))
mNumCachedAttrs++;
if (nsHTMLAtoms::object == tag.get()
&& !content->HasAttr(kNameSpaceID_None, nsHTMLAtoms::src)
&& NS_CONTENT_ATTR_NOT_THERE != content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data)) {
mNumCachedAttrs++;
}
// now lets make the arrays
mCachedAttrParamNames = (char **)PR_Calloc(sizeof(char *) * (mNumCachedAttrs + 1 + mNumCachedParams), 1);

13
mozilla/layout/html/base/src/nsObjectFrame.cpp
View File

@ -2363,8 +2363,8 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetDocument(nsIDocument* *aDocument)
if (nsnull != mContext) {
nsCOMPtr<nsIPresShell> shell;
mContext->GetShell(getter_AddRefs(shell));
rv = shell->GetDocument(aDocument);
if (shell)
rv = shell->GetDocument(aDocument);
}
return rv;
}
@ -3014,10 +3014,11 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
nsAutoString data;
nsCOMPtr<nsIAtom> tag;
content->GetTag(*getter_AddRefs(tag));
if (nsHTMLAtoms::object == tag.get() &&
!content->HasAttr(kNameSpaceID_None, nsHTMLAtoms::src) &&
NS_SUCCEEDED(content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data)))
mNumCachedAttrs++;
if (nsHTMLAtoms::object == tag.get()
&& !content->HasAttr(kNameSpaceID_None, nsHTMLAtoms::src)
&& NS_CONTENT_ATTR_NOT_THERE != content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data)) {
mNumCachedAttrs++;
}
// now lets make the arrays
mCachedAttrParamNames = (char **)PR_Calloc(sizeof(char *) * (mNumCachedAttrs + 1 + mNumCachedParams), 1);