2008-09-24 Marek Habersack <mhabersack@novell.com>

	* Double.cs: check whether decimal_separator, group_separator and
	currency_symbol strings aren't empty before trying to index them
	in Parse ().

svn path=/trunk/mcs/; revision=114004

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index c331be2c7e9530b4110ba03677c89be77c460f1e..548f036cc81e78e2eecc3ed5797e0b6d8471a6fd 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-24  Marek Habersack  <mhabersack@novell.com>
+
+       * Double.cs: check whether decimal_separator, group_separator and
+       currency_symbol strings aren't empty before trying to index them
+       in Parse ().
+
 2008-09-24  Jb Evain  <jbevain@novell.com>
 
        * AppDomain.cs (CreateDomain): call the domain initializer in

diff --git a/mcs/class/corlib/System/Double.cs b/mcs/class/corlib/System/Double.cs
index f8bee418f99fa828a7571ab08a8f64fa8a3dc68e..6ecb6314b050188b821d7e72b385490036ef7100 100644 (file)
--- a/mcs/class/corlib/System/Double.cs
+++ b/mcs/class/corlib/System/Double.cs
@@ -344,7 +344,7 @@ namespace System {
                                        if (c == 'e' || c == 'E')
                                                goto case State_Decimal;
                                        
-                                       if (decimal_separator != null &&
+                                       if (decimal_separator_len > 0 &&
                                            decimal_separator [0] == c) {
                                                if (String.CompareOrdinal (s, sidx, decimal_separator, 0, decimal_separator_len) == 0) {
                                                        b [didx++] = (byte) '.';
@@ -353,7 +353,7 @@ namespace System {
                                                        break;
                                                }
                                        }
-                                       if (group_separator != null &&
+                                       if (group_separator_len > 0 &&
                                            group_separator [0] == c){
                                                if (s.Substring (sidx, group_separator_len) ==
                                                    group_separator){
@@ -362,7 +362,7 @@ namespace System {
                                                        break;
                                                }
                                        }
-                                       if (currency_symbol != null &&
+                                       if (currency_symbol_len > 0 &&
                                            currency_symbol [0] == c){
                                                if (s.Substring (sidx, currency_symbol_len) ==
                                                    currency_symbol){