2007-28-02 Lluis Sanchez Gual <lluis@novell.com>

	* ChannelCore.cs: Added missing null check. LoadWithPartialName can
	return null.

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

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog
index 5fc08f3d590cdb06b9fbc12608627e57f6290c62..bc932ec90bc881c546eb6a59df65534e2048bbe6 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog
@@ -1,3 +1,8 @@
+2007-28-02  Lluis Sanchez Gual  <lluis@novell.com>
+
+       * ChannelCore.cs: Added missing null check. LoadWithPartialName can
+       return null.
+
 2006-12-18  Lluis Sanchez Gual  <lluis@novell.com>
 
        * SoapMessageFormatter.cs: FieldSetter and FieldGetter methods need

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChannelCore.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChannelCore.cs
index 0eb305fde96b467e4d30a5ec925f9ba36a44476a..08b091c468ce30ab34a4dc7468863132441ff767 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChannelCore.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChannelCore.cs
@@ -58,6 +58,8 @@ namespace System.Runtime.Remoting.Channels
                        
                        // Try using the simple name
                        asm = Assembly.LoadWithPartialName (assemblyName);
+                       if (asm == null)
+                               return null;
                        return asm.GetType (typeName, true);
                }
        }