Author: spouliot
Date: 2008-01-22 07:23:25 -0500 (Tue, 22 Jan 2008)
New Revision: 93518

Modified:
   trunk/mcs/class/Mono.Posix/Mono.Unix.Native/ChangeLog
   trunk/mcs/class/Mono.Posix/Mono.Unix.Native/Syscall.cs
Log:
2008-01-22  Sebastien Pouliot  <[EMAIL PROTECTED]>

        * Syscall.cs: Fix Flock.Equals to avoid NRE (and return false if object 
        is null). Found using Gendarme.



Modified: trunk/mcs/class/Mono.Posix/Mono.Unix.Native/ChangeLog
===================================================================
--- trunk/mcs/class/Mono.Posix/Mono.Unix.Native/ChangeLog       2008-01-22 
12:23:09 UTC (rev 93517)
+++ trunk/mcs/class/Mono.Posix/Mono.Unix.Native/ChangeLog       2008-01-22 
12:23:25 UTC (rev 93518)
@@ -1,3 +1,8 @@
+2008-01-22  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * Syscall.cs: Fix Flock.Equals to avoid NRE (and return false if object 
+       is null). Found using Gendarme.
+
 2008-01-05  Jonathan Pryor  <[EMAIL PROTECTED]>
 
        * Syscall.cs: Add ST_NOEXEC, ST_REMOUNT, ST_BIND to MountFlags.  Patch 
from

Modified: trunk/mcs/class/Mono.Posix/Mono.Unix.Native/Syscall.cs
===================================================================
--- trunk/mcs/class/Mono.Posix/Mono.Unix.Native/Syscall.cs      2008-01-22 
12:23:09 UTC (rev 93517)
+++ trunk/mcs/class/Mono.Posix/Mono.Unix.Native/Syscall.cs      2008-01-22 
12:23:25 UTC (rev 93518)
@@ -739,7 +739,7 @@
 
                public override bool Equals (object obj)
                {
-                       if (obj.GetType() != GetType())
+                       if ((obj == null) || (obj.GetType () != GetType ()))
                                return false;
                        Flock value = (Flock) obj;
                        return l_type == value.l_type && l_whence == 
value.l_whence && 

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

Reply via email to