changeset in /hg/icedtea: 2007-11-17 Thomas Fitzsimmons <fitzs...

[Thomas Fitzsimmons]

changeset 2d695c70ac52 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2d695c70ac52
description:
	2007-11-17  Thomas Fitzsimmons  <fitzsim at redhat.com>

		* patches/icedtea-lcms-leak.patch: Release array immediately after
		cmsOpenProfileFromMem.

diffstat:

2 files changed, 11 insertions(+), 9 deletions(-)
ChangeLog                       |    5 +++++
patches/icedtea-lcms-leak.patch |   15 ++++++---------

diffs (36 lines):

diff -r 437c6ac6cae4 -r 2d695c70ac52 ChangeLog
--- a/ChangeLog	Fri Nov 16 23:37:17 2007 -0500
+++ b/ChangeLog	Sat Nov 17 12:45:23 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-16  Lillian Angel  <langel at redha
+2007-11-17  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+	* patches/icedtea-lcms-leak.patch: Release array immediately after
+	cmsOpenProfileFromMem.
+
 2007-11-16  Lillian Angel  <langel at redhat.com>
 
 	* INSTALL: Updated.
diff -r 437c6ac6cae4 -r 2d695c70ac52 patches/icedtea-lcms-leak.patch
--- a/patches/icedtea-lcms-leak.patch	Fri Nov 16 23:37:17 2007 -0500
+++ b/patches/icedtea-lcms-leak.patch	Sat Nov 17 12:45:23 2007 -0500
@@ -1,14 +1,11 @@
---- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c.orig	2007-11-15 19:07:12.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2007-11-15 19:09:31.000000000 -0500
-@@ -183,9 +183,10 @@
+--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c.orig	2007-11-17 11:07:47.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2007-11-17 11:12:47.000000000 -0500
+@@ -182,6 +182,8 @@
+ 
      sProf.pf = cmsOpenProfileFromMem((LPVOID)dataArray, (DWORD) dataSize);
  
++    (*env)->ReleaseByteArrayElements (env, data, dataArray, 0);
++
      if (sProf.pf == NULL) {
-+        (*env)->ReleaseByteArrayElements (env, data, dataArray, 0);
          JNU_ThrowIllegalArgumentException(env, "Invalid profile data");
      }
--
-+    (*env)->ReleaseByteArrayElements (env, data, dataArray, 0);
-     return sProf.j;
- }
-