From f5ea9aa2f32c7ca9a1fdf793580fddba3daae1b9 Mon Sep 17 00:00:00 2001
From: Dan Strokirk <dan.strokirk@gmail.com>
Date: Thu, 24 Jun 2021 17:15:25 +0200
Subject: Fixed #32807 -- Fixed JSONField crash when redisplaying None values.

Thanks to Alex Hill for the initial patch.
---
 django/forms/fields.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'django/forms/fields.py')

diff --git a/django/forms/fields.py b/django/forms/fields.py
index 57886656de..f1275aa387 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -1251,6 +1251,8 @@ class JSONField(CharField):
     def bound_data(self, data, initial):
         if self.disabled:
             return initial
+        if data is None:
+            return None
         try:
             return json.loads(data, cls=self.decoder)
         except json.JSONDecodeError:
-- 
cgit v1.3