From df3f26d0aa0a12d210780eab63adb48b2a1b69e5 Mon Sep 17 00:00:00 2001
From: Joao Matos <joao@tritao.eu>
Date: Tue, 12 Jan 2016 23:22:53 +0000
Subject: [PATCH] Improved null handling when marshaling CLI strings.

---
 src/Generator/Generators/CLI/CLIMarshal.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Generator/Generators/CLI/CLIMarshal.cs b/src/Generator/Generators/CLI/CLIMarshal.cs
index 70bcb4bf..5d54d878 100644
--- a/src/Generator/Generators/CLI/CLIMarshal.cs
+++ b/src/Generator/Generators/CLI/CLIMarshal.cs
@@ -180,7 +180,9 @@ namespace CppSharp.Generators.CLI
                 throw new NotSupportedException(string.Format("{0} is not supported yet.",
                     Context.Driver.Options.Encoding.EncodingName));
 
-            return string.Format("clix::marshalString<clix::{1}>({0})", varName, param);
+            return string.Format(
+                "({0} == 0 ? nullptr : clix::marshalString<clix::{1}>({0}))",
+                varName, param);
         }
 
         public override bool VisitMemberPointerType(MemberPointerType member,