mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix use-after-free error reported by Neil Conway.

Browse Source
This commit is contained in:
Alvaro Herrera 2006-06-30 15:06:05 +00:00
parent 569e32a0f1
commit 78bfc22ee2
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/psql/common.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2006, PostgreSQL Global Development Group * Copyright (c) 2000-2006, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.119 2006/06/14 16:49:02 tgl Exp $ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.120 2006/06/30 15:06:05 alvherre Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "common.h" #include "common.h"
@ -875,19 +875,19 @@ SendQuery(const char *query)
if (OK) if (OK)
OK = PrintQueryResults(results); OK = PrintQueryResults(results);
PQclear(results);
/* If we made a temporary savepoint, possibly release/rollback */ /* If we made a temporary savepoint, possibly release/rollback */
if (on_error_rollback_savepoint) if (on_error_rollback_savepoint)
{ {
PGresult *svptres;
transaction_status = PQtransactionStatus(pset.db); transaction_status = PQtransactionStatus(pset.db);
/* We always rollback on an error */ /* We always rollback on an error */
if (transaction_status == PQTRANS_INERROR) if (transaction_status == PQTRANS_INERROR)
results = PQexec(pset.db, "ROLLBACK TO pg_psql_temporary_savepoint"); svptres = PQexec(pset.db, "ROLLBACK TO pg_psql_temporary_savepoint");
/* If they are no longer in a transaction, then do nothing */ /* If they are no longer in a transaction, then do nothing */
else if (transaction_status != PQTRANS_INTRANS) else if (transaction_status != PQTRANS_INTRANS)
results = NULL; svptres = NULL;
else else
{ {
/* /*
@ -898,20 +898,22 @@ SendQuery(const char *query)
if (strcmp(PQcmdStatus(results), "SAVEPOINT") == 0 || if (strcmp(PQcmdStatus(results), "SAVEPOINT") == 0 ||
strcmp(PQcmdStatus(results), "RELEASE") == 0 || strcmp(PQcmdStatus(results), "RELEASE") == 0 ||
strcmp(PQcmdStatus(results), "ROLLBACK") == 0) strcmp(PQcmdStatus(results), "ROLLBACK") == 0)
results = NULL; svptres = NULL;
else else
results = PQexec(pset.db, "RELEASE pg_psql_temporary_savepoint"); svptres = PQexec(pset.db, "RELEASE pg_psql_temporary_savepoint");
} }
if (PQresultStatus(results) != PGRES_COMMAND_OK) if (svptres && PQresultStatus(svptres) != PGRES_COMMAND_OK)
{ {
psql_error("%s", PQerrorMessage(pset.db)); psql_error("%s", PQerrorMessage(pset.db));
PQclear(results); PQclear(results);
PQclear(svptres);
ResetCancelConn(); ResetCancelConn();
return false; return false;
} }
PQclear(results);
} }
PQclear(results);
/* Possible microtiming output */ /* Possible microtiming output */
if (OK && pset.timing) if (OK && pset.timing)
printf(_("Time: %.3f ms\n"), DIFF_MSEC(&after, &before)); printf(_("Time: %.3f ms\n"), DIFF_MSEC(&after, &before));