electrum

commit 8960b16e09f8631a41341ced2b02896aa03cb994
parent b813ba0bdd43a46b2fe0217f91ed9efa110ec88e
Author: ThomasV <thomasv@gitorious>
Date:   Wed, 22 Jul 2015 15:28:43 +0200

more sanitization

Diffstat:
M
lib/paymentrequest.py
 | 
4
++--
M
lib/wallet.py
 | 
4
++++

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py
@@ -292,9 +292,9 @@ def make_unsigned_request(req):
     addr = req['address']
     time = req.get('time', 0)
     expires = req.get('exp', 0)
-    if type(time) != int:
+    if time and type(time) != int:
         time = 0
-    if type(exp) != int:
+    if exp and type(exp) != int:
         exp = 0
     amount = req['amount']
     if amount is None:
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -1245,7 +1245,11 @@ class Abstract_Wallet(object):
         address = r['address']
         amount = r.get('amount')
         timestamp = r.get('time', 0)
+        if timestamp and type(timestamp) != int:
+            timestamp = 0
         expiration = r.get('exp')
+        if expiration and type(expiration) != int:
+            expiration = 0
         if amount:
             if self.up_to_date:
                 paid = amount <= self.get_addr_received(address)