projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[Mono.Unix] Fix crasher in StringToHeap (#5639)
[mono.git]
/
mcs
/
class
/
Mono.Posix
/
Mono.Unix
/
UnixMarshal.cs
diff --git
a/mcs/class/Mono.Posix/Mono.Unix/UnixMarshal.cs
b/mcs/class/Mono.Posix/Mono.Unix/UnixMarshal.cs
index 0b01eb19ad40fc1592cd78c2ed3aa74f6a1c6a7e..7d39fd4c43ffad92bcf2f284a542482b63f0c4eb 100644
(file)
--- 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);
}