Merge

--HG--
branch : trunk

1 files changed, 4 insertions, 8 deletions

diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp
index 1012c94cbdd..793fabecde7 100644
--- a/src/shared/Database/SqlOperations.cpp
+++ b/src/shared/Database/SqlOperations.cpp
@@ -109,7 +109,7 @@ bool SqlQueryHolder::SetQuery(size_t index, const char *sql)
     }
 
     /// not executed yet, just stored (it's not called a holder for nothing)
-    m_queries[index] = SqlResultPair(strdup(sql), NULL);
+    m_queries[index] = SqlResultPair(strdup(sql), QueryResult_AutoPtr(NULL));
     return true;
 }
 
@@ -136,7 +136,7 @@ bool SqlQueryHolder::SetPQuery(size_t index, const char *format, ...)
     return SetQuery(index,szQuery);
 }
 
-QueryResult* SqlQueryHolder::GetResult(size_t index)
+QueryResult_AutoPtr SqlQueryHolder::GetResult(size_t index)
 {
     if(index < m_queries.size())
     {
@@ -150,10 +150,10 @@ QueryResult* SqlQueryHolder::GetResult(size_t index)
         return m_queries[index].second;
     }
     else
-        return NULL;
+        return QueryResult_AutoPtr(NULL);
 }
 
-void SqlQueryHolder::SetResult(size_t index, QueryResult *result)
+void SqlQueryHolder::SetResult(size_t index, QueryResult_AutoPtr result)
 {
     /// store the result in the holder
     if(index < m_queries.size())
@@ -167,11 +167,7 @@ SqlQueryHolder::~SqlQueryHolder()
         /// if the result was never used, free the resources
         /// results used already (getresult called) are expected to be deleted
         if(m_queries[i].first != NULL)
-        {
             free((void*)(const_cast<char*>(m_queries[i].first)));
-            if(m_queries[i].second)
-                delete m_queries[i].second;
-        }
     }
 }