Merge pull request #136 from daptiv/issue120

Fixed NullRef, serialized DTO can be null
ServiceStack · Apr 14, 2012 · cba794d · cba794d
2 parents 9e24486 + 7268868
commit cba794d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/ServiceStack/WebHost.EndPoints/Formats/HtmlFormat.cs b/src/ServiceStack/WebHost.EndPoints/Formats/HtmlFormat.cs
@@ -41,7 +41,8 @@ public void SerializeToStream(IRequestContext requestContext, object dto, IHttpR
 				&& httpReq.ResponseContentType != ContentType.JsonReport) return;
 
 			// Serialize then escape any potential script tags to avoid XSS when displaying as HTML
-			var json = JsonSerializer.SerializeToString(dto).Replace("<", "&lt;").Replace(">", "&gt;");
+			var json = JsonSerializer.SerializeToString(dto) ?? "null";
+			json = json.Replace("<", "&lt;").Replace(">", "&gt;");
 
 			var url = httpReq.AbsoluteUri
 				.Replace("format=html", "")