Make ActivityLog.json_data safe

pretalx · May 7, 2024 · 70c8a98 · 70c8a98
1 parent b07536b
commit 70c8a98
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/pretalx/common/models/log.py b/src/pretalx/common/models/log.py
@@ -1,5 +1,6 @@
 import json
 import logging
+from contextlib import suppress
 
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
@@ -53,7 +54,8 @@ def __str__(self):
     @cached_property
     def json_data(self):
         if self.data:
-            return json.loads(self.data)
+            with suppress(json.JSONDecodeError):
+                return json.loads(self.data)
         return {}
 
     @cached_property