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

Fixing bug 411082. Fix top crash bug due to us calling into scriptable helper code w/o pushing a JS context on the stack. r+sr=jonas@sicking.cc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@242857 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%mozilla.org 2008-01-10 21:46:33 +00:00
parent fbaced852b
commit d8af1d36c6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1654,10 +1654,13 @@ nsObjectFrame::NotifyContentObjectWrapper()
if (NS_FAILED(rv))
return;
// Abuse the scriptable helper to trigger prototype setup for the
// wrapper for mContent so that this plugin becomes part of the DOM
// object.
helper->PostCreate(wrapper, cx, obj);
nsCxPusher cxPusher;
if (cxPusher.Push(mContent)) {
// Abuse the scriptable helper to trigger prototype setup for the
// wrapper for mContent so that this plugin becomes part of the DOM
// object.
helper->PostCreate(wrapper, cx, obj);
}
}
// static

1
mozilla/modules/oji/src/ProxyClassLoader.cpp
View File

@ -69,6 +69,7 @@ static nsresult getScriptClassLoader(JNIEnv* env, jobject* classloader)
JSContext* cx;
rv = contexts->Peek(&cx);
if (NS_FAILED(rv)) return rv;
if (!cx) return NS_ERROR_NOT_AVAILABLE;
// lookup "window.navigator.javaclasses", if it exists, this is the class
// loader bound to this page.