From f6e1d9e0260c1349846974ce42f9a13042d5c580 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Mon, 24 Mar 2014 10:46:23 +0100
Subject: [PATCH] Fix for an Issue #650

---
 lib/core/settings.py |  3 +++
 lib/utils/hashdb.py  | 27 +++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index f6f05ad4c..05edefa14 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -460,6 +460,9 @@ HASHDB_FLUSH_THRESHOLD = 32
 # Number of retries for unsuccessful HashDB flush attempts
 HASHDB_FLUSH_RETRIES = 3
 
+# Number of retries for unsuccessful HashDB end transaction attempts
+HASHDB_END_TRANSACTION_RETRIES = 3
+
 # Unique milestone value used for forced deprecation of old HashDB values (e.g. when changing hash/pickle mechanism)
 HASHDB_MILESTONE_VALUE = "cAWxkLYCQT"  # r5129 "".join(random.sample(string.ascii_letters, 10))
 
diff --git a/lib/utils/hashdb.py b/lib/utils/hashdb.py
index 9a29615cb..f0aa783f2 100644
--- a/lib/utils/hashdb.py
+++ b/lib/utils/hashdb.py
@@ -16,6 +16,7 @@ from lib.core.common import serializeObject
 from lib.core.common import unserializeObject
 from lib.core.data import logger
 from lib.core.exception import SqlmapDataException
+from lib.core.settings import HASHDB_END_TRANSACTION_RETRIES
 from lib.core.settings import HASHDB_FLUSH_RETRIES
 from lib.core.settings import HASHDB_FLUSH_THRESHOLD
 from lib.core.settings import UNICODE_ENCODING
@@ -43,7 +44,11 @@ class HashDB(object):
 
         return threadData.hashDBCursor
 
-    cursor = property(_get_cursor)
+    def _set_cursor(self, cursor):
+        threadData = getCurrentThreadData()
+        threadData.hashDBCursor = cursor
+
+    cursor = property(_get_cursor, _set_cursor)
 
     def close(self):
         threadData = getCurrentThreadData()
@@ -134,15 +139,29 @@ class HashDB(object):
     def beginTransaction(self):
         threadData = getCurrentThreadData()
         if not threadData.inTransaction:
-            self.cursor.execute('BEGIN TRANSACTION')
+            self.cursor.execute("BEGIN TRANSACTION")
             threadData.inTransaction = True
 
     def endTransaction(self):
         threadData = getCurrentThreadData()
         if threadData.inTransaction:
+            retries = 0
+            while retries < HASHDB_END_TRANSACTION_RETRIES:
+                try:
+                    self.cursor.execute("END TRANSACTION")
+                    threadData.inTransaction = False
+                except sqlite3.OperationalError:
+                    pass
+                else:
+                    return
+
+                retries += 1
+                time.sleep(1)
+
             try:
-                self.cursor.execute('END TRANSACTION')
+                self.cursor.execute("ROLLBACK TRANSACTION")
             except sqlite3.OperationalError:
-                pass
+                self.cursor.close()
+                self.cursor = None
             finally:
                 threadData.inTransaction = False