From b21e683490216d897abd9d6916e7fefb6250b8a0 Mon Sep 17 00:00:00 2001
From: Vlado Velichkovski <stormwin@users.noreply.github.com>
Date: Tue, 18 Aug 2015 00:16:13 +0200
Subject: [PATCH] Fix for #1341

---
 lib/core/convert.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/core/convert.py b/lib/core/convert.py
index 8f7123a00..66aef3f80 100644
--- a/lib/core/convert.py
+++ b/lib/core/convert.py
@@ -12,6 +12,7 @@ import sys
 
 from lib.core.settings import IS_WIN
 from lib.core.settings import UNICODE_ENCODING
+from lib.core.data import logger
 
 def base64decode(value):
     """
@@ -21,7 +22,16 @@ def base64decode(value):
     'foobar'
     """
 
-    return base64.b64decode(value)
+    retVal = None
+
+    try:
+        retVal = base64.b64decode(value)
+    except:
+        errMsg = "Invalid Base64 string"
+        logger.error(errMsg)
+        exit()
+    
+    return retVal
 
 def base64encode(value):
     """
@@ -71,6 +81,10 @@ def base64unpickle(value):
         retVal = pickle.loads(base64decode(value))
     except TypeError: 
         retVal = pickle.loads(base64decode(bytes(value)))
+    except:
+        errMsg = "Cannot deserialize object"
+        logger.error(errMsg)
+        exit()
 
     return retVal