mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2026-11-21 14:19:25 -10:00
Fix for -c configuration values overriding explicit CLI zeros (e.g. --delay 0, -v 0)
This commit is contained in:
1 parent
563066e4f5
commit
71907c80fe
2 files changed
+2
-2
No files matched your search
+1
-1
@@ -2652,7 +2652,7 @@ def _mergeOptions(inputOptions, overrideOptions):
|
||||
inputOptionsItems = inputOptions.__dict__.items()
|
||||
|
||||
for key, value in inputOptionsItems:
|
||||
if key not in conf or value not in (None, False) or overrideOptions:
|
||||
if key not in conf or (value is not None and value is not False) or overrideOptions: # Note: explicit zero (e.g. '--delay 0') has to win over the configuration file
|
||||
conf[key] = value
|
||||
|
||||
if not conf.api:
|
||||
|
||||
@@ -19,7 +19,7 @@ from lib.core.enums import OS
|
||||
from thirdparty import six
|
||||
|
||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||
VERSION = "1.10.11.46"
|
||||
VERSION = "1.10.11.47"
|
||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
||||
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
||||
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
||||
|
||||
Reference in new issue
Block a user