Author: atsushi
Date: 2005-04-17 00:57:40 -0400 (Sun, 17 Apr 2005)
New Revision: 43138

Modified:
   trunk/mcs/class/corlib/System.Globalization/ChangeLog
   trunk/mcs/class/corlib/System.Globalization/TextInfo.cs
Log:
2005-04-17  Atsushi Enomoto  <[EMAIL PROTECTED]>

        * TextInfo.cs : Additional null check for Parent CultureInfo.



Modified: trunk/mcs/class/corlib/System.Globalization/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/ChangeLog       2005-04-17 
04:06:34 UTC (rev 43137)
+++ trunk/mcs/class/corlib/System.Globalization/ChangeLog       2005-04-17 
04:57:40 UTC (rev 43138)
@@ -1,3 +1,7 @@
+2005-04-17  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * TextInfo.cs : Additional null check for Parent CultureInfo.
+
 2005-04-06  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * TextInfo.cs : To make new CultureInfo (127) as invariant, it should

Modified: trunk/mcs/class/corlib/System.Globalization/TextInfo.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/TextInfo.cs     2005-04-17 
04:06:34 UTC (rev 43137)
+++ trunk/mcs/class/corlib/System.Globalization/TextInfo.cs     2005-04-17 
04:57:40 UTC (rev 43138)
@@ -222,7 +222,7 @@
                        switch ((int) c) {
                        case '\u0049': // Latin uppercase I
                                CultureInfo tmp = ci;
-                               while (tmp.Parent != tmp && tmp.Parent.LCID != 
0x7F)
+                               while (tmp.Parent != null && tmp.Parent != tmp 
&& tmp.Parent.LCID != 0x7F)
                                        tmp = tmp.Parent;
                                switch (tmp.LCID) {
                                case 44: // Azeri (az)
@@ -264,7 +264,7 @@
                        switch (c) {
                        case '\u0069': // Latin lowercase i
                                CultureInfo tmp = ci;
-                               while (tmp.Parent != tmp && tmp.Parent.LCID != 
0x7F)
+                               while (tmp.Parent != null && tmp.Parent != tmp 
&& tmp.Parent.LCID != 0x7F)
                                        tmp = tmp.Parent;
                                switch (tmp.LCID) {
                                case 44: // Azeri (az)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to