From d82f20abc4bec1fed6ea4a9ed37a9717b7f0fd43 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 28 Jul 2016 17:02:27 +0200 Subject: [PATCH] Fixes #2068 --- lib/core/option.py | 2 ++ lib/core/settings.py | 2 +- txt/checksum.md5 | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/core/option.py b/lib/core/option.py index 0f56fd6ac..738377263 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -2195,6 +2195,8 @@ def _mergeOptions(inputOptions, overrideOptions): try: inputOptions = base64unpickle(inputOptions.pickledOptions) _normalizeOptions(inputOptions) + if type(inputOptions) == dict: + inputOptions = AttribDict(inputOptions) except Exception, ex: errMsg = "provided invalid value '%s' for option '--pickled-options'" % inputOptions.pickledOptions errMsg += " ('%s')" % ex if ex.message else "" diff --git a/lib/core/settings.py b/lib/core/settings.py index 67fdd1374..163460457 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import OS from lib.core.revision import getRevisionNumber # sqlmap version (...) -VERSION = "1.0.7.40" +VERSION = "1.0.7.41" REVISION = getRevisionNumber() STABLE = VERSION.count('.') <= 2 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev") diff --git a/txt/checksum.md5 b/txt/checksum.md5 index decc1119e..a21c01411 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -39,13 +39,13 @@ e4aec2b11c1ad6039d0c3dbbfbc5eb1a lib/core/exception.py cc9c82cfffd8ee9b25ba3af6284f057e lib/core/__init__.py 91c514013daa796e2cdd940389354eac lib/core/log.py b9779615206791e6ebbaa84947842b49 lib/core/optiondict.py -1975abc80f5fbc8d6dd9421a50f771d0 lib/core/option.py +21cad4d51154d9145ecd7fbbccc68e91 lib/core/option.py 1e8948dddbd12def5c2af52530738059 lib/core/profiling.py e60456db5380840a586654344003d4e6 lib/core/readlineng.py 5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py 99a2b496b9d5b546b335653ca801153f lib/core/revision.py 7c15dd2777af4dac2c89cab6df17462e lib/core/session.py -b80701b8eaf927683e27192bcbc8825f lib/core/settings.py +4d12f3016bab26effa493750d30a60bd lib/core/settings.py 7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py 23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py 0bc2fae1dec18cdd11954b22358293f2 lib/core/target.py