Fixed prepared statement leak (added explicit server-side deallocation).

SOCI · Oct 7, 2012 · 02bb841 · mloskot · Oct 29, 2012 · 02bb841
1 parent 76f0404
commit 02bb841
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/src/backends/postgresql/session.cpp b/src/backends/postgresql/session.cpp
@@ -55,7 +55,7 @@ postgresql_session_backend::~postgresql_session_backend()
 namespace // unnamed
 {
 
-// helper function for hardoded queries
+// helper function for hardcoded queries
 void hard_exec(PGconn * conn, char const * query, char const * errMsg)
 {
     PGresult* result = PQexec(conn, query);
@@ -91,6 +91,15 @@ void postgresql_session_backend::rollback()
     hard_exec(conn_, "ROLLBACK", "Cannot rollback transaction.");
 }
 
+void postgresql_session_backend::deallocate_prepared_statement(
+    const std::string & statementName)
+{
+    const std::string & query = "DEALLOCATE " + statementName;
+
+    hard_exec(conn_, query.c_str(),
+        "Cannot deallocate prepared statement.");
+}
+
 void postgresql_session_backend::clean_up()
 {
     if (0 != conn_)

diff --git a/src/backends/postgresql/soci-postgresql.h b/src/backends/postgresql/soci-postgresql.h
@@ -236,6 +236,8 @@ struct postgresql_session_backend : details::session_backend
     virtual void commit();
     virtual void rollback();
 
+    void deallocate_prepared_statement(const std::string & statementName);
+
     virtual std::string get_backend_name() const { return "postgresql"; }
 
     void clean_up();

diff --git a/src/backends/postgresql/statement.cpp b/src/backends/postgresql/statement.cpp
@@ -48,6 +48,12 @@ void postgresql_statement_backend::clean_up()
     {
         PQclear(result_);
         result_ = NULL;
+
+        if (statementName_.empty() == false)
+        {
+            session_.deallocate_prepared_statement(statementName_);
+            statementName_.clear();
+        }
     }
 }