From d950cd7323b2b430a8a0443737092bf2d48f9f0a Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Fri, 14 Oct 2016 06:38:49 +0200
Subject: [PATCH] fix crash when parsing request (issue #1969)

---
 lib/paymentrequest.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py
index bf0a8322..9990d618 100644
--- a/lib/paymentrequest.py
+++ b/lib/paymentrequest.py
@@ -117,7 +117,11 @@ class PaymentRequest:
             self.error = "Empty request"
             return
         pr = pb2.PaymentRequest()
-        pr.ParseFromString(self.raw)
+        try:
+            pr.ParseFromString(self.raw)
+        except:
+            self.error = "Error: Cannot parse payment request"
+            return
         if not pr.signature:
             # the address will be dispayed as requestor
             self.requestor = None