/hg/release/icedtea-web-1.0: Fix PR619: Improper finalization by...

[dbhole at icedtea.classpath.org]

changeset d07ccc83a09c in /hg/release/icedtea-web-1.0
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=d07ccc83a09c
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Jan 20 11:06:41 2011 -0500

	Fix PR619: Improper finalization by the plugin can crash the browser


diffstat:

3 files changed, 12 insertions(+)
ChangeLog                                               |    6 ++++++
NEWS                                                    |    1 +
plugin/icedteanp/java/netscape/javascript/JSObject.java |    5 +++++

diffs (39 lines):

diff -r 71d6595e800c -r d07ccc83a09c ChangeLog
--- a/ChangeLog	Tue Jan 18 13:51:34 2011 -0500
+++ b/ChangeLog	Thu Jan 20 11:06:41 2011 -0500
@@ -1,3 +1,9 @@ 2011-01-18  Andrew Su  <asu at redhat.com>
+2011-01-20  Deepak Bhole <dbhole at redhat.com>
+
+	PR619: Improper finalization by the plugin can crash the browser
+	* plugin/icedteanp/java/netscape/javascript/JSObject.java (finalize):
+	Proceed with finalization only if JSObject is valid.
+
 2011-01-18  Andrew Su  <asu at redhat.com>
 
 	* netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java:
diff -r 71d6595e800c -r d07ccc83a09c NEWS
--- a/NEWS	Tue Jan 18 13:51:34 2011 -0500
+++ b/NEWS	Thu Jan 20 11:06:41 2011 -0500
@@ -22,6 +22,7 @@ New in release 1.0 (2010-XX-XX):
   - PR565: UIDefaults.getUI fails with jgoodies:looks 2.3.1
   - PR593: Increment of invalidated iterator in IcedTeaPluginUtils (patch from barbara.xxx1975 at libero.it)
   - PR597: Entities are parsed incorrectly in PARAM tag in applet plugin
+  - PR619: Improper finalization by the plugin can crash the browser
   - Applets are now double-buffered to eliminate flicker in ones that do heavy drawing
   - RH665104: OpenJDK Firefox Java plugin loses a cookie
 * NetX
diff -r 71d6595e800c -r d07ccc83a09c plugin/icedteanp/java/netscape/javascript/JSObject.java
--- a/plugin/icedteanp/java/netscape/javascript/JSObject.java	Tue Jan 18 13:51:34 2011 -0500
+++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java	Thu Jan 20 11:06:41 2011 -0500
@@ -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);
     }