/hg/release/icedtea6-1.9: Fix PR619: Improper finalization by th...

[dbhole at icedtea.classpath.org]

changeset 09eef2decb0f in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=09eef2decb0f
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Jan 20 11:11:20 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 6ec6e96141d8 -r 09eef2decb0f ChangeLog
--- a/ChangeLog	Tue Jan 18 15:17:47 2011 +0000
+++ b/ChangeLog	Thu Jan 20 11:11:20 2011 -0500
@@ -1,3 +1,9 @@ 2011-01-18  Andrew John Hughes  <ahughes
+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 John Hughes  <ahughes at redhat.com>
 
 	* configure.ac: Bump to 1.9.5pre.
diff -r 6ec6e96141d8 -r 09eef2decb0f NEWS
--- a/NEWS	Tue Jan 18 15:17:47 2011 +0000
+++ b/NEWS	Thu Jan 20 11:11:20 2011 -0500
@@ -16,6 +16,7 @@ New in release 1.9.5 (2011-XX-XX):
   - S6782079: PNG: reading metadata may cause OOM on truncated images
 * Fixes
   - RH647157,RH582455: Update fontconfig files for rhel 6
+  - PR619: Improper finalization by the plugin can crash the browser
 
 New in release 1.9.4 (2011-01-18):
 
diff -r 6ec6e96141d8 -r 09eef2decb0f plugin/icedteanp/java/netscape/javascript/JSObject.java
--- a/plugin/icedteanp/java/netscape/javascript/JSObject.java	Tue Jan 18 15:17:47 2011 +0000
+++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java	Thu Jan 20 11:11:20 2011 -0500
@@ -279,6 +279,11 @@ public final class JSObject {
      */
     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);
     }