From 8806ce72c1078e328bb8115413c2d8a0051addb1 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 18 Aug 2015 22:03:42 +0200
Subject: [PATCH] Patch for an Issue #1341

---
 lib/core/option.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/core/option.py b/lib/core/option.py
index fb3abe86d..57628db2a 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -2063,7 +2063,12 @@ def _mergeOptions(inputOptions, overrideOptions):
     """
 
     if inputOptions.pickledOptions:
-        inputOptions = base64unpickle(inputOptions.pickledOptions)
+        try:
+            inputOptions = base64unpickle(inputOptions.pickledOptions)
+        except Exception, ex:
+            errMsg = "provided invalid value '%s' for option '--pickled-options'" % inputOptions.pickledOptions
+            errMsg += " ('%s')" % ex.message if ex.message else ""
+            raise SqlmapSyntaxException(errMsg)
 
     if inputOptions.configFile:
         configFileParser(inputOptions.configFile)