aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf.Conformance/Program.cs
diff options
context:
space:
mode:
Diffstat (limited to 'csharp/src/Google.Protobuf.Conformance/Program.cs')
-rw-r--r--csharp/src/Google.Protobuf.Conformance/Program.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/csharp/src/Google.Protobuf.Conformance/Program.cs b/csharp/src/Google.Protobuf.Conformance/Program.cs
index 8f72c8f9..c40851c6 100644
--- a/csharp/src/Google.Protobuf.Conformance/Program.cs
+++ b/csharp/src/Google.Protobuf.Conformance/Program.cs
@@ -101,6 +101,10 @@ namespace Google.Protobuf.Conformance
{
return new ConformanceResponse { ParseError = e.Message };
}
+ catch (InvalidJsonException e)
+ {
+ return new ConformanceResponse { ParseError = e.Message };
+ }
switch (request.RequestedOutputFormat)
{
case global::Conformance.WireFormat.JSON: