mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-25 11:03:47 +03:00
Update for #4380
This commit is contained in:
parent
13a2ab3fa3
commit
231c3da057
|
@ -18,7 +18,7 @@ from lib.core.enums import OS
|
||||||
from thirdparty.six import unichr as _unichr
|
from thirdparty.six import unichr as _unichr
|
||||||
|
|
||||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||||
VERSION = "1.4.10.3"
|
VERSION = "1.4.10.4"
|
||||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
||||||
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
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)
|
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
||||||
|
|
|
@ -169,7 +169,7 @@ def _oneShotUnionUse(expression, unpack=True, limited=False):
|
||||||
logger.warn(warnMsg)
|
logger.warn(warnMsg)
|
||||||
elif re.search(r"ORDER BY [^ ]+\Z", expression):
|
elif re.search(r"ORDER BY [^ ]+\Z", expression):
|
||||||
debugMsg = "retrying failed SQL query without the ORDER BY clause"
|
debugMsg = "retrying failed SQL query without the ORDER BY clause"
|
||||||
logger.debug(debugMsg)
|
singleTimeDebugMessage(debugMsg)
|
||||||
|
|
||||||
expression = re.sub(r"\s*ORDER BY [^ ]+\Z", "", expression)
|
expression = re.sub(r"\s*ORDER BY [^ ]+\Z", "", expression)
|
||||||
retVal = _oneShotUnionUse(expression, unpack, limited)
|
retVal = _oneShotUnionUse(expression, unpack, limited)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user