mirror of
				https://github.com/sqlmapproject/sqlmap.git
				synced 2025-11-04 01:47:37 +03:00 
			
		
		
		
	Fixes #1320
This commit is contained in:
		
							parent
							
								
									301aca57e6
								
							
						
					
					
						commit
						bcb25823e6
					
				| 
						 | 
				
			
			@ -876,7 +876,7 @@ def dataToOutFile(filename, data):
 | 
			
		|||
                f.write(data)
 | 
			
		||||
        except IOError, ex:
 | 
			
		||||
            errMsg = "something went wrong while trying to write "
 | 
			
		||||
            errMsg += "to the output file ('%s')" % ex
 | 
			
		||||
            errMsg += "to the output file ('%s')" % getUnicode(ex)
 | 
			
		||||
            raise SqlmapGenericException(errMsg)
 | 
			
		||||
 | 
			
		||||
    return retVal
 | 
			
		||||
| 
						 | 
				
			
			@ -3662,7 +3662,7 @@ def evaluateCode(code, variables=None):
 | 
			
		|||
    except KeyboardInterrupt:
 | 
			
		||||
        raise
 | 
			
		||||
    except Exception, ex:
 | 
			
		||||
        errMsg = "an error occurred while evaluating provided code ('%s'). " % ex
 | 
			
		||||
        errMsg = "an error occurred while evaluating provided code ('%s') " % getUnicode(ex)
 | 
			
		||||
        raise SqlmapGenericException(errMsg)
 | 
			
		||||
 | 
			
		||||
def serializeObject(object_):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -74,7 +74,7 @@ class Dump(object):
 | 
			
		|||
        try:
 | 
			
		||||
            self._outputFP.write(text)
 | 
			
		||||
        except IOError, ex:
 | 
			
		||||
            errMsg = "error occurred while writing to log file ('%s')" % ex
 | 
			
		||||
            errMsg = "error occurred while writing to log file ('%s')" % getUnicode(ex)
 | 
			
		||||
            raise SqlmapGenericException(errMsg)
 | 
			
		||||
 | 
			
		||||
        if kb.get("multiThreadMode"):
 | 
			
		||||
| 
						 | 
				
			
			@ -94,7 +94,7 @@ class Dump(object):
 | 
			
		|||
        try:
 | 
			
		||||
            self._outputFP = openFile(self._outputFile, "ab" if not conf.flushSession else "wb")
 | 
			
		||||
        except IOError, ex:
 | 
			
		||||
            errMsg = "error occurred while opening log file ('%s')" % ex
 | 
			
		||||
            errMsg = "error occurred while opening log file ('%s')" % getUnicode(ex)
 | 
			
		||||
            raise SqlmapGenericException(errMsg)
 | 
			
		||||
 | 
			
		||||
    def getOutputFile(self):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1521,7 +1521,7 @@ def _createTemporaryDirectory():
 | 
			
		|||
            os.makedirs(tempfile.gettempdir())
 | 
			
		||||
    except IOError, ex:
 | 
			
		||||
        errMsg = "there has been a problem while accessing "
 | 
			
		||||
        errMsg += "system's temporary directory location(s) ('%s'). Please " % ex
 | 
			
		||||
        errMsg += "system's temporary directory location(s) ('%s'). Please " % getUnicode(ex)
 | 
			
		||||
        errMsg += "make sure that there is enough disk space left. If problem persists, "
 | 
			
		||||
        errMsg += "try to set environment variable 'TEMP' to a location "
 | 
			
		||||
        errMsg += "writeable by the current user"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -70,7 +70,7 @@ class Replication(object):
 | 
			
		|||
            try:
 | 
			
		||||
                self.parent.cursor.execute(sql, parameters)
 | 
			
		||||
            except sqlite3.OperationalError, ex:
 | 
			
		||||
                errMsg = "problem occurred ('%s') while accessing sqlite database " % ex
 | 
			
		||||
                errMsg = "problem occurred ('%s') while accessing sqlite database " % unicode(ex)
 | 
			
		||||
                errMsg += "located at '%s'. Please make sure that " % self.parent.dbpath
 | 
			
		||||
                errMsg += "it's not used by some other program"
 | 
			
		||||
                raise SqlmapGenericException(errMsg)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -862,7 +862,7 @@ def cmdLineParser():
 | 
			
		|||
                for arg in shlex.split(command):
 | 
			
		||||
                    argv.append(getUnicode(arg, encoding=sys.stdin.encoding))
 | 
			
		||||
            except ValueError, ex:
 | 
			
		||||
                raise SqlmapSyntaxException, "something went wrong during command line parsing ('%s')" % ex
 | 
			
		||||
                raise SqlmapSyntaxException, "something went wrong during command line parsing ('%s')" % getUnicode(ex)
 | 
			
		||||
 | 
			
		||||
        # Hide non-basic options in basic help case
 | 
			
		||||
        for i in xrange(len(argv)):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -44,6 +44,7 @@ from lib.core.common import clearConsoleLine
 | 
			
		|||
from lib.core.common import dataToStdout
 | 
			
		||||
from lib.core.common import getFileItems
 | 
			
		||||
from lib.core.common import getPublicTypeMembers
 | 
			
		||||
from lib.core.common import getUnicode
 | 
			
		||||
from lib.core.common import hashDBRetrieve
 | 
			
		||||
from lib.core.common import hashDBWrite
 | 
			
		||||
from lib.core.common import normalizeUnicode
 | 
			
		||||
| 
						 | 
				
			
			@ -769,7 +770,7 @@ def dictionaryAttack(attack_dict):
 | 
			
		|||
 | 
			
		||||
                except Exception, ex:
 | 
			
		||||
                    warnMsg = "there was a problem while loading dictionaries"
 | 
			
		||||
                    warnMsg += " ('%s')" % ex
 | 
			
		||||
                    warnMsg += " ('%s')" % getUnicode(ex)
 | 
			
		||||
                    logger.critical(warnMsg)
 | 
			
		||||
 | 
			
		||||
            message = "do you want to use common password suffixes? (slow!) [y/N] "
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -341,13 +341,13 @@ class Entries:
 | 
			
		|||
                        attackDumpedTable()
 | 
			
		||||
                    except (IOError, OSError), ex:
 | 
			
		||||
                        errMsg = "an error occurred while attacking "
 | 
			
		||||
                        errMsg += "table dump ('%s')" % ex
 | 
			
		||||
                        errMsg += "table dump ('%s')" % getUnicode(ex)
 | 
			
		||||
                        logger.critical(errMsg)
 | 
			
		||||
                    conf.dumper.dbTableValues(kb.data.dumpedTable)
 | 
			
		||||
 | 
			
		||||
            except SqlmapConnectionException, ex:
 | 
			
		||||
                errMsg = "connection exception detected in dumping phase "
 | 
			
		||||
                errMsg += "('%s')" % ex
 | 
			
		||||
                errMsg += "('%s')" % getUnicode(ex)
 | 
			
		||||
                logger.critical(errMsg)
 | 
			
		||||
 | 
			
		||||
            finally:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user