changeset in /hg/icedtea6: 2008-09-15 Lillian Angel <langel at re...

[Lillian Angel]

changeset 02fc4b7ada3d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=02fc4b7ada3d
description:
	2008-09-15  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-lc_ctype.patch: Fixed array size and
	        changed to use malloc/free.

diffstat:

2 files changed, 21 insertions(+), 4 deletions(-)
ChangeLog                      |    5 +++++
patches/icedtea-lc_ctype.patch |   20 ++++++++++++++++----

diffs (43 lines):

diff -r c46e727121a8 -r 02fc4b7ada3d ChangeLog
--- a/ChangeLog	Sat Sep 13 09:32:12 2008 +0200
+++ b/ChangeLog	Mon Sep 15 11:20:54 2008 -0400
@@ -1,3 +1,8 @@ 2008-09-12  Matthias Klose  <doko at ubuntu
+2008-09-15  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-lc_ctype.patch: Fixed array size and 
+	changed to use malloc/free.
+
 2008-09-12  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am, HACKING: Update for b12 zero patch.
diff -r c46e727121a8 -r 02fc4b7ada3d patches/icedtea-lc_ctype.patch
--- a/patches/icedtea-lc_ctype.patch	Sat Sep 13 09:32:12 2008 +0200
+++ b/patches/icedtea-lc_ctype.patch	Mon Sep 15 11:20:54 2008 -0400
@@ -1,11 +1,23 @@
---- java_props_md.c	2008-09-10 12:36:05.000000000 -0400
-+++ openjdk/jdk/src/solaris/native/java/lang/java_props_md.c	2008-09-10 12:36:13.000000000 -0400
-@@ -211,7 +211,7 @@
+--- oldopenjdk6/jdk/src/solaris/native/java/lang/java_props_md.c	2008-08-28 04:15:51.000000000 -0400
++++ openjdk/jdk/src/solaris/native/java/lang/java_props_md.c	2008-09-15 10:37:26.000000000 -0400
+@@ -211,7 +211,9 @@
               * <language name>_<country name>.<encoding name>@<variant name>
               * <country name>, <encoding name>, and <variant name> are optional.
               */
 -            char temp[64];
-+            char temp[strlen(lc)];
++	    char * temp;
++	    temp = (char*) malloc(strlen(lc)+1);
++
              char *language = NULL, *country = NULL, *variant = NULL,
                   *encoding = NULL;
              char *std_language = NULL, *std_country = NULL, *std_variant = NULL,
+@@ -323,6 +325,9 @@
+             /* return same result nl_langinfo would return for en_UK,
+              * in order to use optimizations. */
+             std_encoding = (*p != '\0') ? p : "ISO8859-1";
++	
++	    /* Free temp */
++	    free(temp);
+ 
+ 
+ #ifdef __linux__