From 437a5d90b227921f84ce9b9ed11047b27ed09f17 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Sun, 16 May 2010 13:31:52 +0200 Subject: Fix a possible crash in SqlTransaction::Execute(), using post-iterating on the LockedQueue instead of pre-iterating. Thanks to click for the insight and Spp for testing. --HG-- branch : trunk --- src/shared/Database/SqlOperations.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/shared/Database/SqlOperations.cpp') diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp index c766d6ca21d..8894f896855 100644 --- a/src/shared/Database/SqlOperations.cpp +++ b/src/shared/Database/SqlOperations.cpp @@ -35,21 +35,32 @@ void SqlTransaction::Execute(Database *db) { const char* sql; + if (m_queue.empty()) + return; + db->DirectExecute("START TRANSACTION"); - while (m_queue.next(sql)) + while (!m_queue.empty()) { + sql = m_queue.peek(); + m_queue.unlock(); if (!db->DirectExecute(sql)) { free((void*)const_cast(sql)); + m_queue.pop_front(); db->DirectExecute("ROLLBACK"); - while (m_queue.next(sql)) + while (!m_queue.empty()) { + sql = m_queue.peek(); + m_queue.unlock(); free((void*)const_cast(sql)); + m_queue.pop_front(); } + return; } free((void*)const_cast(sql)); + m_queue.pop_front(); } db->DirectExecute("COMMIT"); -- cgit v1.2.3