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

layout/generic/nsObjectFrame.cpp

@@ -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

modules/oji/src/ProxyClassLoader.cpp

@@ -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.