From d0e9bd53b8e1fe92876fc4ad7c7e4600a38a2aa5 Mon Sep 17 00:00:00 2001
From: marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2>
Date: Sat, 5 Mar 2011 00:32:48 +0000
Subject:  * fixed minor logic errors in pqconnection that lead to double free
 (actually pqclear()). Mantis 17784 by Andrew Brunner

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@17078 3ad0048d-3df7-0310-abae-a5850022a9f2
---
 packages/fcl-db/src/sqldb/postgres/pqconnection.pp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'packages/fcl-db/src/sqldb/postgres')

diff --git a/packages/fcl-db/src/sqldb/postgres/pqconnection.pp b/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
index 664b8a2bd9..4c479f80c4 100644
--- a/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
+++ b/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
@@ -561,10 +561,11 @@ begin
       res := pqexec(tr.PGConn,pchar('deallocate prepst'+nr));
       if (PQresultStatus(res) <> PGRES_COMMAND_OK) then
         begin
+          pqclear(res);
+          DatabaseError(SErrPrepareFailed + ' (PostgreSQL: ' + PQerrorMessage(tr.PGConn) + ')',self)
+        end
+      else
         pqclear(res);
-        DatabaseError(SErrPrepareFailed + ' (PostgreSQL: ' + PQerrorMessage(tr.PGConn) + ')',self)
-        end;
-      pqclear(res);
       end;
     FPrepared := False;
     end;
@@ -641,9 +642,12 @@ begin
         s := Statement;
       res := pqexec(tr.PGConn,pchar(s));
       if (PQresultStatus(res) in [PGRES_COMMAND_OK,PGRES_TUPLES_OK]) then
-        pqclear(res);
+        begin
+          pqclear(res); 
+          res:=nil;
+        end;
       end;
-    if not (PQresultStatus(res) in [PGRES_COMMAND_OK,PGRES_TUPLES_OK]) then
+    if assigned(res) and not (PQresultStatus(res) in [PGRES_COMMAND_OK,PGRES_TUPLES_OK]) then
       begin
       s := PQerrorMessage(tr.PGConn);
       pqclear(res);
-- 
cgit v1.2.1


From 3be5651d31e44f305489417a44195daa09e26ba4 Mon Sep 17 00:00:00 2001
From: michael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>
Date: Tue, 29 Mar 2011 11:15:41 +0000
Subject: * Fix for 19018

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@17205 3ad0048d-3df7-0310-abae-a5850022a9f2
---
 packages/fcl-db/src/sqldb/postgres/pqconnection.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/fcl-db/src/sqldb/postgres')

diff --git a/packages/fcl-db/src/sqldb/postgres/pqconnection.pp b/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
index 4c479f80c4..d40e9a9398 100644
--- a/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
+++ b/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
@@ -546,7 +546,7 @@ begin
       FPrepared := True;
       end
     else
-      statement := buf;
+      statement := AParams.ParseSQL(buf,false,sqEscapeSlash in ConnOptions, sqEscapeRepeat in ConnOptions,psPostgreSQL);
     end;
 end;
 
-- 
cgit v1.2.1