mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-22 09:36:35 +03:00
Minor fixes
This commit is contained in:
parent
b380d34d3c
commit
b798222dd7
|
@ -380,9 +380,9 @@ def dataToOutFile(data):
|
|||
|
||||
rFile = filePathToString(conf.rFile)
|
||||
rFilePath = "%s%s%s" % (conf.filePath, os.sep, rFile)
|
||||
rFileFP = codecs.open(rFilePath, "wb", conf.dataEncoding)
|
||||
rFileFP = codecs.open(rFilePath, "wb")
|
||||
|
||||
rFileFP.write(utf8decode(data))
|
||||
rFileFP.write(data)
|
||||
rFileFP.flush()
|
||||
rFileFP.close()
|
||||
|
||||
|
@ -421,7 +421,7 @@ def fileToStr(fileName):
|
|||
@rtype: C{str}
|
||||
"""
|
||||
|
||||
filePointer = codecs.open(fileName, "rb", conf.dataEncoding)
|
||||
filePointer = codecs.open(fileName, "rb")
|
||||
fileText = filePointer.read()
|
||||
|
||||
return fileText.replace(" ", "").replace("\t", "").replace("\r", "").replace("\n", " ")
|
||||
|
|
|
@ -92,7 +92,7 @@ optDict = {
|
|||
"getCurrentDb": ("boolean", "Databases"),
|
||||
"isDba": "boolean",
|
||||
"getUsers": ("boolean", "Users"),
|
||||
"getPasswordHashes": ("boolean", "Hashes"),
|
||||
"getPasswordHashes": ("boolean", "Passwords"),
|
||||
"getPrivileges": ("boolean", "Privileges"),
|
||||
"getRoles": ("boolean", "Roles"),
|
||||
"getDbs": ("boolean", "Databases"),
|
||||
|
|
|
@ -127,7 +127,7 @@ def __setOutputResume():
|
|||
__url_cache = set()
|
||||
__expression_cache = {}
|
||||
|
||||
for line in readSessionFP.readlines(): #xreadlines doesn't return unicode strings when codec.open used
|
||||
for line in readSessionFP.readlines(): # xreadlines doesn't return unicode strings when codec.open() is used
|
||||
if line.count("][") == 4:
|
||||
line = line.split("][")
|
||||
|
||||
|
@ -142,7 +142,7 @@ def __setOutputResume():
|
|||
if url[0] == "[":
|
||||
url = url[1:]
|
||||
|
||||
value = value.rstrip('\r\n') #strips both chars independently
|
||||
value = value.rstrip('\r\n') # Strips both chars independently
|
||||
|
||||
if url not in ( conf.url, conf.hostname ):
|
||||
continue
|
||||
|
|
|
@ -21,6 +21,7 @@ You should have received a copy of the GNU General Public License along
|
|||
with sqlmap; if not, write to the Free Software Foundation, Inc., 51
|
||||
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
"""
|
||||
|
||||
import codecs
|
||||
|
||||
from ConfigParser import NoSectionError
|
||||
|
|
|
@ -414,7 +414,6 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
|
|||
|
||||
break
|
||||
elif commonCharset:
|
||||
# TODO: this part does not seem to work yet
|
||||
val = getChar(index, commonCharset, False)
|
||||
|
||||
# If we had no luck with singleValue and common charset,
|
||||
|
|
|
@ -775,7 +775,7 @@ class Enumeration:
|
|||
plusOne = True
|
||||
else:
|
||||
plusOne = False
|
||||
indexRange = getRange(count)
|
||||
indexRange = getRange(count, plusOne=plusOne)
|
||||
|
||||
for index in indexRange:
|
||||
if kb.dbms in ("SQLite", "Firebird"):
|
||||
|
|
Loading…
Reference in New Issue
Block a user