Merge pull request #335 from ianbattersby/fix/stdio-exception-escaping

Fix string escaping on exception messages for Stdio
OmniSharp · Nov 10, 2015 · 87f89c8 · 87f89c8
2 parents 0c2dc12 + b83f2e5
commit 87f89c8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/OmniSharp.Stdio/StdioServer.cs b/src/OmniSharp.Stdio/StdioServer.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OmniSharp.Stdio.Features;
 using OmniSharp.Stdio.Protocol;
@@ -57,7 +58,7 @@ private void Run()
                             _writer.WriteLine(new EventPacket()
                             {
                                 Event = "error",
-                                Body = e.ToString()
+                                Body = JsonConvert.ToString(e.ToString(), '"', StringEscapeHandling.Default)
                             });
                         }
                     });
@@ -107,7 +108,7 @@ private async Task HandleRequest(string json)
                     // updating the response object here so that the ResponseStream
                     // prints the latest state when being closed
                     response.Success = false;
-                    response.Message = e.ToString();
+                    response.Message = JsonConvert.ToString(e.ToString(), '"', StringEscapeHandling.Default);
                 }
                 finally
                 {