Missing calls to PQclear in large_obj.c and describe.c.

tglsfdc · tglsfdc · commit 7dc5472d4821 · 2003-06-27T16:55:23.000Z
Greg Sabino Mullane
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000-2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.77 2003/05/28 16:03:59 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.78 2003/06/27 16:55:22 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -963,7 +963,10 @@ describeOneTableDetails(const char *schemaname,
 							  oid);
 			result2 = PSQLexec(buf.data, false);
 			if (!result2)
+			{
+				PQclear(result1);
 				goto error_return;
+			}
 			else
 				check_count = PQntuples(result2);
 		}
@@ -978,7 +981,11 @@ describeOneTableDetails(const char *schemaname,
 							  oid);
 			result3 = PSQLexec(buf.data, false);
 			if (!result3)
+			{
+				PQclear(result1);
+				PQclear(result2);
 				goto error_return;
+			}
 			else
 				rule_count = PQntuples(result3);
 		}
@@ -998,7 +1005,12 @@ describeOneTableDetails(const char *schemaname,
 							  oid);
 			result4 = PSQLexec(buf.data, false);
 			if (!result4)
+			{
+				PQclear(result1);
+				PQclear(result2);
+				PQclear(result3);
 				goto error_return;
+			}
 			else
 				trigger_count = PQntuples(result4);
 		}
@@ -1014,7 +1026,13 @@ describeOneTableDetails(const char *schemaname,
 							  oid);
 			result5 = PSQLexec(buf.data, false);
 			if (!result5)
+			{
+				PQclear(result1);
+				PQclear(result2);
+				PQclear(result3);
+				PQclear(result4);
 				goto error_return;
+			}
 			else
 				foreignkey_count = PQntuples(result5);
 		}
diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000-2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.25 2003/04/18 23:38:47 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.26 2003/06/27 16:55:23 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "large_obj.h"
@@ -78,6 +78,7 @@ handle_transaction(void)
 	}
 
 	PQsetNoticeProcessor(pset.db, old_notice_hook, NULL);
+	PQclear(res);
 	return true;
 }
 
@@ -324,6 +325,7 @@ do_lo_unlink(const char *loid_arg)
 			}
 			return false;
 		}
+		PQclear(res);
 	}
 
 	if (own_transaction)

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000-2002 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.25 2003/04/18 23:38:47 tgl Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.26 2003/06/27 16:55:23 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "large_obj.h"`
`@@ -78,6 +78,7 @@ handle_transaction(void)`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`PQsetNoticeProcessor(pset.db, old_notice_hook, NULL);`
	`81`	`+ PQclear(res);`
`81`	`82`	`return true;`
`82`	`83`	`}`
`83`	`84`
`@@ -324,6 +325,7 @@ do_lo_unlink(const char *loid_arg)`
`324`	`325`	`}`
`325`	`326`	`return false;`
`326`	`327`	`}`
	`328`	`+ PQclear(res);`
`327`	`329`	`}`
`328`	`330`
`329`	`331`	`if (own_transaction)`