From 2a2d7e886d810e0e03324cc85a9e2f2dc4dd59b6 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Fri, 11 Jan 2013 10:52:03 +0000 Subject: [PATCH] align to MSSQL connector --- plugins/dbms/sybase/connector.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/plugins/dbms/sybase/connector.py b/plugins/dbms/sybase/connector.py index b490eec72..203aa7053 100644 --- a/plugins/dbms/sybase/connector.py +++ b/plugins/dbms/sybase/connector.py @@ -51,24 +51,31 @@ class Connector(GenericConnector): try: return self.cursor.fetchall() except (pymssql.ProgrammingError, pymssql.OperationalError, _mssql.MssqlDatabaseException), msg: - logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg) + logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % str(msg).replace("\n", " ")) return None def execute(self, query): + retVal = False + try: self.cursor.execute(utf8encode(query)) + retVal = True except (pymssql.OperationalError, pymssql.ProgrammingError), msg: - logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg) + logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % str(msg).replace("\n", " ")) except pymssql.InternalError, msg: raise SqlmapConnectionException(msg) + return retVal + def select(self, query): - self.execute(query) - value = self.fetchall() + retVal = None - try: - self.connector.commit() - except pymssql.OperationalError: - pass + if self.execute(query): + retVal = self.fetchall() - return value + try: + self.connector.commit() + except pymssql.OperationalError: + pass + + return retVal