Merge branch 'master' of github.com:sqlmapproject/sqlmap

lib/core/option.py

@@ -1784,7 +1784,7 @@ def _mergeOptions(inputOptions, overrideOptions):
             kb.explicitSettings.add(key)
 
     for key, value in defaults.items():
-        if conf[key] is None:
+        if hasattr(conf, key) and conf[key] is None:
             conf[key] = value
 
 def _setTrafficOutputFP():

lib/core/optiondict.py

@@ -183,6 +183,7 @@ optDict = {
                                "hexConvert":        "boolean",
                                "oDir":              "string",
                                "parseErrors":       "boolean",
+                               "saveCmdline":       "boolean",
                                "updateAll":         "boolean",
                                "tor":               "boolean",
                                "torPort":           "integer",
@@ -202,9 +203,19 @@ optDict = {
                                "hpp":               "boolean",
                                "mobile":            "boolean",
                                "pageRank":          "boolean",
+                               "purgeOutput":       "boolean",
                                "smart":             "boolean",
                                "testFilter":        "string",
                                "wizard":            "boolean",
                                "verbose":           "integer"
                              },
+            "Hidden": {
+                               "profile":           "boolean",
+                               "cpuThrottle":       "integer",
+                               "forceDns":          "boolean",
+                               "smokeTest":         "boolean",
+                               "liveTest":          "boolean",
+                               "stopFail":          "boolean",
+                               "runCase":           "string"
+                      }
           }