From 939fa5d2c4f310c26b0bd84b9e161398bad8e83d Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 13 Apr 2010 08:29:15 +0000
Subject: [PATCH] some fixes

---
 plugins/dbms/access/connector.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/plugins/dbms/access/connector.py b/plugins/dbms/access/connector.py
index d63f679bd..5ccb340a3 100644
--- a/plugins/dbms/access/connector.py
+++ b/plugins/dbms/access/connector.py
@@ -48,17 +48,30 @@ class Connector(GenericConnector):
     def connect(self):
         self.initConnection()
 
-        try:
-            self.connector = pyodbc.connect('DSN=%s' % self.db)
-        except (pyodbc.Error, pyodbc.OperationalError), msg:
-            raise sqlmapConnectionException, msg[1]
+        lastMsg = None
+        for connString in ('Driver={Microsoft Access Driver (*.mdb)};Dbq=%s;Uid=Admin;Pwd=;' % self.db, 'DSN=%s' % self.db):
+            try:
+                self.connector = pyodbc.connect(connString)
+                break
+            except pyodbc.Error, msg:
+                lastMsg = msg
+            except pyodbc.OperationalError, msg:
+                raise sqlmapConnectionException, msg[1]
+        if not self.connector:
+            raise sqlmapConnectionException, lastMsg[1]
 
         self.setCursor()
         self.connected()
 
     def fetchall(self):
         try:
-            return self.cursor.fetchall()
+            output = self.cursor.fetchall()
+            for i in xrange(len(output)):
+                for j in xrange(len(output[i])):
+                    if type(output[i][j]) == str and output[i][j].find('\0') != -1:
+                        output[i][j] = output[i][j][:output[i][j].find('\0')].rstrip()
+            return output
+
         except pyodbc.ProgrammingError, msg:
             logger.log(8, msg[1])
             return None