X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMono.Posix%2FMono.Unix%2FUnixMarshal.cs;fp=mcs%2Fclass%2FMono.Posix%2FMono.Unix%2FUnixMarshal.cs;h=7d39fd4c43ffad92bcf2f284a542482b63f0c4eb;hb=98e4187cf080c2004c1c1c268e1b43faf1b4613f;hp=0b01eb19ad40fc1592cd78c2ed3aa74f6a1c6a7e;hpb=b586119cb961894e53e361ca91cb23f1ff2eb791;p=mono.git

diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixMarshal.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixMarshal.cs
index 0b01eb19ad4..7d39fd4c43f 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixMarshal.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixMarshal.cs
@@ -309,6 +309,9 @@ namespace Mono.Unix {
 
 		public static IntPtr StringToHeap (string s, Encoding encoding)
 		{
+			if (s == null)
+				return IntPtr.Zero;
+
 			return StringToHeap (s, 0, s.Length, encoding);
 		}