mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-02-16 19:40:37 +03:00
Minor adjustment to reflect Metasploit r6849 (http://trac.metasploit.com/changeset/6849) and minor code refactoring.
This commit is contained in:
parent
8096a37940
commit
b4fd71e8b9
|
@ -781,11 +781,13 @@ def pollProcess(process):
|
||||||
|
|
||||||
returncode = process.poll()
|
returncode = process.poll()
|
||||||
|
|
||||||
if returncode != None:
|
if returncode is not None:
|
||||||
if returncode == 0:
|
if returncode == 0:
|
||||||
dataToStdout(" done\n")
|
dataToStdout(" done\n")
|
||||||
else:
|
elif returncode < 0:
|
||||||
dataToStdout(" quit unexpectedly by signal %d\n" % returncode)
|
dataToStdout(" process terminated by signal %d\n" % returncode)
|
||||||
|
elif returncode > 0:
|
||||||
|
dataToStdout(" quit unexpectedly with return code %d\n" % returncode)
|
||||||
|
|
||||||
break
|
break
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ import sys
|
||||||
|
|
||||||
|
|
||||||
# sqlmap version and site
|
# sqlmap version and site
|
||||||
VERSION = "0.7rc4"
|
VERSION = "0.7rc5"
|
||||||
VERSION_STRING = "sqlmap/%s" % VERSION
|
VERSION_STRING = "sqlmap/%s" % VERSION
|
||||||
SITE = "http://sqlmap.sourceforge.net"
|
SITE = "http://sqlmap.sourceforge.net"
|
||||||
|
|
||||||
|
|
|
@ -78,15 +78,25 @@ class UPX:
|
||||||
|
|
||||||
dataToStdout("\r[%s] [INFO] compression in progress " % time.strftime("%X"))
|
dataToStdout("\r[%s] [INFO] compression in progress " % time.strftime("%X"))
|
||||||
pollProcess(process)
|
pollProcess(process)
|
||||||
upxStderr = process.communicate()[1]
|
upxStdout, upxStderr = process.communicate()
|
||||||
|
|
||||||
if upxStderr:
|
warnMsg = "failed to compress the file"
|
||||||
logger.warn("failed to compress the file")
|
|
||||||
|
if "NotCompressibleException" in upxStdout:
|
||||||
|
warnMsg += " because you provided a Metasploit version above "
|
||||||
|
warnMsg += "3.3-dev revision 6681. This will not inficiate "
|
||||||
|
warnMsg += "the correct execution of sqlmap. It might "
|
||||||
|
warnMsg += "only slow down a bit the execution of sqlmap"
|
||||||
|
logger.info(warnMsg)
|
||||||
|
|
||||||
|
elif upxStderr:
|
||||||
|
logger.warn(warnMsg)
|
||||||
|
|
||||||
return None
|
|
||||||
else:
|
else:
|
||||||
return os.path.getsize(srcFile)
|
return os.path.getsize(srcFile)
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
def unpack(self, srcFile, dstFile=None):
|
def unpack(self, srcFile, dstFile=None):
|
||||||
pass
|
pass
|
||||||
|
|
Loading…
Reference in New Issue
Block a user