Author: spouliot
Date: 2008-01-21 20:06:46 -0500 (Mon, 21 Jan 2008)
New Revision: 93468
Modified:
trunk/mcs/class/corlib/System/ChangeLog
trunk/mcs/class/corlib/System/DateTimeOffset.cs
Log:
DateTimeOffset.cs: Avoid NRE on bad cast if null is provided to Equals(object).
Found using Gendarme.
Modified: trunk/mcs/class/corlib/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System/ChangeLog 2008-01-22 01:02:39 UTC (rev
93467)
+++ trunk/mcs/class/corlib/System/ChangeLog 2008-01-22 01:06:46 UTC (rev
93468)
@@ -1,3 +1,8 @@
+2008-01-21 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * DateTimeOffset.cs: Avoid NRE on bad cast if null is provided to
+ Equals(object). Found using Gendarme.
+
2008-01-16 Zoltan Varga <[EMAIL PROTECTED]>
* DateTimeOffset.cs: Fix warnings.
Modified: trunk/mcs/class/corlib/System/DateTimeOffset.cs
===================================================================
--- trunk/mcs/class/corlib/System/DateTimeOffset.cs 2008-01-22 01:02:39 UTC
(rev 93467)
+++ trunk/mcs/class/corlib/System/DateTimeOffset.cs 2008-01-22 01:06:46 UTC
(rev 93468)
@@ -178,7 +178,9 @@
public override bool Equals (object other)
{
- return UtcDateTime == ((DateTimeOffset)
other).UtcDateTime;
+ if (other is DateTimeOffset)
+ return UtcDateTime == ((DateTimeOffset)
other).UtcDateTime;
+ return false;
}
public static bool Equals (DateTimeOffset first, DateTimeOffset
second)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
