/hg/release/icedtea6-1.7: Fix Shark sharkCompiler mattr memory c...

[xranby at icedtea.classpath.org]

changeset 546f16ad97d5 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=546f16ad97d5
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Mar 04 13:37:57 2010 +0100

	Fix Shark sharkCompiler mattr memory corruption bug.

	2010-03-04 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(sharkCompiler::sharkCompiler): Move mattr define to make its memory
	valid in the scope where it are used by the args vector.


diffstat:

2 files changed, 7 insertions(+), 1 deletion(-)
ChangeLog                                          |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |    2 +-

diffs (26 lines):

diff -r 240dae063336 -r 546f16ad97d5 ChangeLog
--- a/ChangeLog	Mon Mar 01 15:26:06 2010 +0000
+++ b/ChangeLog	Thu Mar 04 13:37:57 2010 +0100
@@ -1,3 +1,9 @@ 2010-02-17 Andrew John Hughes  <ahughes@
+2010-03-04  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+        * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+        (sharkCompiler::sharkCompiler): Move mattr define to make its memory
+        valid in the scope where it are used by the args vector.
+
 2010-02-17 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 240dae063336 -r 546f16ad97d5 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Mar 01 15:26:06 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Thu Mar 04 13:37:57 2010 +0100
@@ -71,8 +71,8 @@ SharkCompiler::SharkCompiler()
   args.push_back(""); // program name
   args.push_back(cpu.c_str());
 
+  std::string mattr("-mattr=");
   if(gotCpuFeatures){
-    std::string mattr("-mattr=");
     for(StringMap<bool>::iterator I = Features.begin(),
       E = Features.end(); I != E; ++I){
       if(I->second){