Fixed #24818 -- Prevented models.CharField from accepting a string as max_length

1 files changed, 2 insertions, 6 deletions

diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index f9ae55f844..3351b4ad35 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -1069,11 +1069,7 @@ class CharField(Field):
         return errors
 
     def _check_max_length_attribute(self, **kwargs):
-        try:
-            max_length = int(self.max_length)
-            if max_length <= 0:
-                raise ValueError()
-        except TypeError:
+        if self.max_length is None:
             return [
                 checks.Error(
                     "CharFields must define a 'max_length' attribute.",
@@ -1082,7 +1078,7 @@ class CharField(Field):
                     id='fields.E120',
                 )
             ]
-        except ValueError:
+        elif not isinstance(self.max_length, six.integer_types) or self.max_length <= 0:
             return [
                 checks.Error(
                     "'max_length' must be a positive integer.",