sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-01-24 00:04:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1822

Browse Source
This commit is contained in:
Miroslav Stampar 2016-05-06 10:32:16 +02:00
parent 8bbfee7591
commit 5d09f7b85f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/settings.py
View File

@ -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.5.13" VERSION = "1.0.5.14"
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")

7
lib/takeover/metasploit.py
View File

@ -7,6 +7,7 @@ See the file 'doc/COPYING' for copying permission
import os import os
import re import re
import select
import sys import sys
import tempfile import tempfile
import time import time
@ -47,8 +48,6 @@ from lib.core.subprocessng import recv_some
if IS_WIN: if IS_WIN:
import msvcrt import msvcrt
else:
from select import select
class Metasploit: class Metasploit:
""" """
@ -550,7 +549,7 @@ class Metasploit:
# Probably the child has exited # Probably the child has exited
pass pass
else: else:
ready_fds = select([stdin_fd], [], [], 1) ready_fds = select.select([stdin_fd], [], [], 1)
if stdin_fd in ready_fds[0]: if stdin_fd in ready_fds[0]:
try: try:
@ -598,7 +597,7 @@ class Metasploit:
else: else:
proc.kill() proc.kill()
except (EOFError, IOError): except (EOFError, IOError, select.error):
return proc.returncode return proc.returncode
def createMsfShellcode(self, exitfunc, format, extra, encode): def createMsfShellcode(self, exitfunc, format, extra, encode):