aboutsummaryrefslogtreecommitdiffstats
path: root/plugin/icedteanp/java
diff options
context:
space:
mode:
authorDeepak Bhole <[email protected]>2011-01-20 11:06:41 -0500
committerDeepak Bhole <[email protected]>2011-01-20 11:06:41 -0500
commitef785a49ec6f4dd970098f9a2a0ed7d69c7390c2 (patch)
tree6c6e465dbd4d7f9b7df87c70782427be0e74a340 /plugin/icedteanp/java
parent63a8b837179b933d7cf9a2ae08de63b1c7c88439 (diff)
Fix PR619: Improper finalization by the plugin can crash the browser
Diffstat (limited to 'plugin/icedteanp/java')
-rw-r--r--plugin/icedteanp/java/netscape/javascript/JSObject.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/plugin/icedteanp/java/netscape/javascript/JSObject.java b/plugin/icedteanp/java/netscape/javascript/JSObject.java
index 293f2be..a5bf41f 100644
--- a/plugin/icedteanp/java/netscape/javascript/JSObject.java
+++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java
@@ -259,6 +259,11 @@ public final class JSObject {
* JavaScript object.
*/
protected void finalize() {
+
+ // Proceed if this is a valid object (0L == default long == invalid)
+ if (internal == 0L)
+ return;
+
PluginDebug.debug("JSObject.finalize ");
PluginAppletViewer.JavaScriptFinalize(internal);
}