Merge pull request #2663 from matrix-org/rav/invalid_request_utf8

Fix 500 on invalid utf-8 in request

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py

index 8118ee7cc2..71420e54db 100644
--- a/synapse/http/servlet.py
+++ b/synapse/http/servlet.py
@@ -167,7 +167,8 @@ def parse_json_value_from_request(request):
 
     try:
         content = simplejson.loads(content_bytes)
-    except simplejson.JSONDecodeError:
+    except Exception as e:
+        logger.warn("Unable to parse JSON: %s", e)
         raise SynapseError(400, "Content not JSON.", errcode=Codes.NOT_JSON)
 
     return content