Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dd5ac6f

Browse files
committed
Fixes #2357
1 parent 1e7a453 commit dd5ac6f

3 files changed

Lines changed: 10 additions & 11 deletions

File tree

lib/core/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from lib.core.enums import OS
2020

2121
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
22-
VERSION = "1.1.1.11"
22+
VERSION = "1.1.1.12"
2323
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2424
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2525
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

lib/parse/configfile.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
from lib.core.data import cmdLineOptions
1515
from lib.core.data import conf
1616
from lib.core.data import logger
17+
from lib.core.enums import OPTION_TYPE
1718
from lib.core.exception import SqlmapMissingMandatoryOptionException
1819
from lib.core.exception import SqlmapSyntaxException
1920
from lib.core.optiondict import optDict
2021

2122
config = None
2223

23-
def configFileProxy(section, option, boolean=False, integer=False):
24+
def configFileProxy(section, option, datatype):
2425
"""
2526
Parse configuration file and save settings into the configuration
2627
advanced dictionary.
@@ -30,10 +31,12 @@ def configFileProxy(section, option, boolean=False, integer=False):
3031

3132
if config.has_option(section, option):
3233
try:
33-
if boolean:
34+
if datatype == OPTION_TYPE.BOOLEAN:
3435
value = config.getboolean(section, option) if config.get(section, option) else False
35-
elif integer:
36+
elif datatype == OPTION_TYPE.INTEGER:
3637
value = config.getint(section, option) if config.get(section, option) else 0
38+
elif datatype == OPTION_TYPE.FLOAT:
39+
value = config.getfloat(section, option) if config.get(section, option) else 0.0
3740
else:
3841
value = config.get(section, option)
3942
except ValueError, ex:
@@ -91,8 +94,4 @@ def configFileParser(configFile):
9194
for family, optionData in optDict.items():
9295
for option, datatype in optionData.items():
9396
datatype = unArrayizeValue(datatype)
94-
95-
boolean = datatype == "boolean"
96-
integer = datatype == "integer"
97-
98-
configFileProxy(family, option, boolean, integer)
97+
configFileProxy(family, option, datatype)

txt/checksum.md5

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ e544108e2238d756c94a240e8a1ce061 lib/core/optiondict.py
4545
d8e9250f3775119df07e9070eddccd16 lib/core/replication.py
4646
785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py
4747
40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py
48-
f5c3572d071e44ca33347de2a6dfe44f lib/core/settings.py
48+
a6fe19b2988fd79b94155d2da1823c5e lib/core/settings.py
4949
d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py
5050
2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py
5151
afd0636d2e93c23f4f0a5c9b6023ea17 lib/core/target.py
@@ -57,7 +57,7 @@ ad74fc58fc7214802fd27067bce18dd2 lib/core/unescaper.py
5757
310efc965c862cfbd7b0da5150a5ad36 lib/__init__.py
5858
8c4b04062db2245d9e190b413985202a lib/parse/banner.py
5959
9b12924e9da625f97b7ec87773214000 lib/parse/cmdline.py
60-
1a71306c965d563ae2d01e4c48646030 lib/parse/configfile.py
60+
3a31657bc38f277d0016ff6d50bde61f lib/parse/configfile.py
6161
14539f1be714d4f1ed042067d63bc50a lib/parse/handler.py
6262
64e5bb3ecbdd75144500588b437ba8da lib/parse/headers.py
6363
165dc27660c8559318009d44354f27cb lib/parse/html.py

0 commit comments

Comments
 (0)