ms access connector update

stamparm · stamparm · commit 88d74a00c103 · 2010-03-30T12:48:51.000Z
diff --git a/plugins/dbms/access/connector.py b/plugins/dbms/access/connector.py
@@ -68,17 +68,21 @@ def execute(self, query):
 
         try:
             self.cursor.execute(query)
-        except pyodbc.OperationalError, msg:
+        except (pyodbc.OperationalError, pyodbc.ProgrammingError), msg:
             logger.log(8, msg[1])
         except pyodbc.Error, msg:
             raise sqlmapConnectionException, msg[1]
 
         self.connector.commit()
 
     def select(self, query):
-        self.cursor.execute(query)
-        return self.cursor.fetchall()
-
+        try:
+            self.cursor.execute(query)
+            return self.cursor.fetchall()
+        except pyodbc.ProgrammingError, msg:
+            logger.log(8, msg[1])
+            return None
+        
     def setCursor(self):
         self.cursor = self.connector.cursor()
 
diff --git a/plugins/dbms/access/fingerprint.py b/plugins/dbms/access/fingerprint.py
@@ -82,10 +82,12 @@ def __sysTablesCheck(self):
                     negate = True
                     table = table[1:]
                 randInt = randomInt()
-                query   = agent.prefixQuery(" AND EXISTS(SELECT * FROM %s WHERE %d=%d)" % (table, randInt, randInt))
+                query   = agent.prefixQuery(" AND EXISTS(SELECT * FROM %s WHERE %d=%d) FROM %s" % (table, randInt, randInt, table))
                 query   = agent.postfixQuery(query)
                 payload = agent.payload(newValue=query)
                 result  = Request.queryPage(payload)
+                if result is None:
+                    result = False
                 if negate:
                     result = not result
                 exist &= result
