From: Neil Conway <neilc@samurai.com>
Date: Wed, 8 Nov 2006 01:22:55 +0000 (+0000)
Subject: Fix a memory leak in psql: we'd leak a few PGresult handles if
X-Git-Tag: REL8_2_RC1~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=415b925345ef99adaab31af89787a2c0814fcffa;p=thirdparty%2Fpostgresql.git

Fix a memory leak in psql: we'd leak a few PGresult handles if
a connectivity error occurred while executing one of the queries
for "\d <table>". Not serious, but still worth fixing. Patch from
Brendan Jurd.
---

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index bab0e24f957..2e526d44107 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.147 2006/10/09 23:30:33 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.148 2006/11/08 01:22:55 neilc Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -1171,7 +1171,14 @@ describeOneTableDetails(const char *schemaname,
 
 		result6 = PSQLexec(buf.data, false);
 		if (!result6)
+		{
+			PQclear(result1);
+			PQclear(result2);
+			PQclear(result3);
+			PQclear(result4);
+			PQclear(result5);
 			goto error_return;
+		}
 		else
 			inherits_count = PQntuples(result6);