Addressing #5543.

1 files changed, 26 insertions, 1 deletions

diff --git a/talerbank/app/models.py b/talerbank/app/models.py
index 0e9cc47..211ee49 100644
--- a/talerbank/app/models.py
+++ b/talerbank/app/models.py
@@ -28,6 +28,16 @@ from django.core.exceptions import \
     ObjectDoesNotExist
 from .amount import Amount, BadFormatAmount, CurrencyMismatch
 
+class InvalidAmount(Amount):
+    def __init__(self, currency):
+        super(InvalidAmount, self).__init__(currency, value=float('nan'), fraction=float('nan'))
+
+    def stringify(self):
+        return "Invalid Amount, please report"
+    def dump(self):
+        return "Invalid Amount, please report"
+
+class AmountField(models.Field):
 
 ##
 # Helper function that instantiates a zero-valued @a Amount
@@ -75,7 +85,22 @@ class AmountField(models.Field):
         del args # pacify PEP checkers
         if value is None:
             return Amount.parse(settings.TALER_CURRENCY)
-        return Amount.parse(value)
+        try:
+            return Amount.parse(value)
+        except NumberTooBig:
+            # Keep the currency right to avoid causing
+            # exceptions if some operation is attempted
+            # against this invalid amount.  NOTE that the
+            # value is defined as NaN, so no actual/useful
+            # amount will ever be generated using this one.
+            # And more, the NaN value will make it easier
+            # to scan the database to find these faulty
+            # amounts.
+            # We also decide to not raise exception here
+            # because they would propagate in too many places
+            # in the code, and it would be too verbose to
+            # just try-cactch any possible exception situation.
+            return InvalidAmount(settings.TALER_CURRENCY)
 
 
     ##