mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-22 09:36:35 +03:00
Patch for --os-shell against Windows/MySQL where resulting \r caused trouble
This commit is contained in:
parent
c200b2cb19
commit
c10b2825d7
|
@ -119,9 +119,15 @@ class Dump(object):
|
||||||
elif data is not None:
|
elif data is not None:
|
||||||
_ = getUnicode(data)
|
_ = getUnicode(data)
|
||||||
|
|
||||||
if _ and _[-1] == '\n':
|
if _.endswith("\r\n"):
|
||||||
|
_ = _[:-2]
|
||||||
|
|
||||||
|
elif _.endswith("\n"):
|
||||||
_ = _[:-1]
|
_ = _[:-1]
|
||||||
|
|
||||||
|
if _.strip(' '):
|
||||||
|
_ = _.strip(' ')
|
||||||
|
|
||||||
if "\n" in _:
|
if "\n" in _:
|
||||||
self._write("%s:\n---\n%s\n---" % (header, _))
|
self._write("%s:\n---\n%s\n---" % (header, _))
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -19,7 +19,7 @@ from lib.core.enums import OS
|
||||||
from lib.core.revision import getRevisionNumber
|
from lib.core.revision import getRevisionNumber
|
||||||
|
|
||||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||||
VERSION = "1.0.7.24"
|
VERSION = "1.0.7.25"
|
||||||
REVISION = getRevisionNumber()
|
REVISION = getRevisionNumber()
|
||||||
STABLE = VERSION.count('.') <= 2
|
STABLE = VERSION.count('.') <= 2
|
||||||
VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
|
VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user