1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Fixed #33954 -- Prevented models.DecimalField from accepting NaN, Inf, and -Inf values.

This commit is contained in:
Mohamed Karam
2022-08-26 15:06:52 +02:00
committed by Mariusz Felisiak
parent 806e9e2d0d
commit b92ffebb0c
2 changed files with 24 additions and 14 deletions

View File

@@ -2,7 +2,6 @@ import collections.abc
import copy
import datetime
import decimal
import math
import operator
import uuid
import warnings
@@ -1703,22 +1702,24 @@ class DecimalField(Field):
def to_python(self, value):
if value is None:
return value
if isinstance(value, float):
if math.isnan(value):
raise exceptions.ValidationError(
self.error_messages["invalid"],
code="invalid",
params={"value": value},
)
return self.context.create_decimal_from_float(value)
try:
return decimal.Decimal(value)
if isinstance(value, float):
decimal_value = self.context.create_decimal_from_float(value)
else:
decimal_value = decimal.Decimal(value)
except (decimal.InvalidOperation, TypeError, ValueError):
raise exceptions.ValidationError(
self.error_messages["invalid"],
code="invalid",
params={"value": value},
)
if not decimal_value.is_finite():
raise exceptions.ValidationError(
self.error_messages["invalid"],
code="invalid",
params={"value": value},
)
return decimal_value
def get_db_prep_save(self, value, connection):
return connection.ops.adapt_decimalfield_value(