Remove duplicate PQclear(res) operations leading to double free() and

tglsfdc · tglsfdc · commit f7332e88b901 · 2004-09-28T00:49:04.000Z
subsequent core dump.  It looks like at one time DBLINK_RES_ERROR_AS_NOTICE
didn't include a PQclear, but now it does and so these other ones are
duplicate.
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
@@ -345,7 +345,6 @@ dblink_open(PG_FUNCTION_ARGS)
 		else
 		{
 			DBLINK_RES_ERROR_AS_NOTICE("sql error");
-			PQclear(res);
 			PG_RETURN_TEXT_P(GET_TEXT("ERROR"));
 		}
 	}
@@ -419,7 +418,6 @@ dblink_close(PG_FUNCTION_ARGS)
 		else
 		{
 			DBLINK_RES_ERROR_AS_NOTICE("sql error");
-			PQclear(res);
 			PG_RETURN_TEXT_P(GET_TEXT("ERROR"));
 		}
 	}
@@ -531,8 +529,6 @@ dblink_fetch(PG_FUNCTION_ARGS)
 				DBLINK_RES_ERROR("sql error");
 			else
 			{
-				if (res)
-					PQclear(res);
 				DBLINK_RES_ERROR_AS_NOTICE("sql error");
 				SRF_RETURN_DONE(funcctx);
 			}
@@ -720,11 +716,9 @@ dblink_record(PG_FUNCTION_ARGS)
 				DBLINK_RES_ERROR("sql error");
 			else
 			{
-				if (res)
-					PQclear(res);
+				DBLINK_RES_ERROR_AS_NOTICE("sql error");
 				if (freeconn)
 					PQfinish(conn);
-				DBLINK_RES_ERROR_AS_NOTICE("sql error");
 				SRF_RETURN_DONE(funcctx);
 			}
 		}
@@ -938,13 +932,15 @@ dblink_exec(PG_FUNCTION_ARGS)
 		 * result tuple
 		 */
 		sql_cmd_status = GET_TEXT(PQcmdStatus(res));
+		PQclear(res);
 	}
 	else
+	{
+		PQclear(res);
 		ereport(ERROR,
 			  (errcode(ERRCODE_S_R_E_PROHIBITED_SQL_STATEMENT_ATTEMPTED),
 			   errmsg("statement returning results not allowed")));
-
-	PQclear(res);
+	}
 
 	/* if needed, close the connection to the database and cleanup */
 	if (freeconn)

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,6 @@ dblink_open(PG_FUNCTION_ARGS)`
`345`	`345`	`else`
`346`	`346`	`{`
`347`	`347`	`DBLINK_RES_ERROR_AS_NOTICE("sql error");`
`348`		`- PQclear(res);`
`349`	`348`	`PG_RETURN_TEXT_P(GET_TEXT("ERROR"));`
`350`	`349`	`}`
`351`	`350`	`}`
`@@ -419,7 +418,6 @@ dblink_close(PG_FUNCTION_ARGS)`
`419`	`418`	`else`
`420`	`419`	`{`
`421`	`420`	`DBLINK_RES_ERROR_AS_NOTICE("sql error");`
`422`		`- PQclear(res);`
`423`	`421`	`PG_RETURN_TEXT_P(GET_TEXT("ERROR"));`
`424`	`422`	`}`
`425`	`423`	`}`
`@@ -531,8 +529,6 @@ dblink_fetch(PG_FUNCTION_ARGS)`
`531`	`529`	`DBLINK_RES_ERROR("sql error");`
`532`	`530`	`else`
`533`	`531`	`{`
`534`		`- if (res)`
`535`		`- PQclear(res);`
`536`	`532`	`DBLINK_RES_ERROR_AS_NOTICE("sql error");`
`537`	`533`	`SRF_RETURN_DONE(funcctx);`
`538`	`534`	`}`
`@@ -720,11 +716,9 @@ dblink_record(PG_FUNCTION_ARGS)`
`720`	`716`	`DBLINK_RES_ERROR("sql error");`
`721`	`717`	`else`
`722`	`718`	`{`
`723`		`- if (res)`
`724`		`- PQclear(res);`
	`719`	`+ DBLINK_RES_ERROR_AS_NOTICE("sql error");`
`725`	`720`	`if (freeconn)`
`726`	`721`	`PQfinish(conn);`
`727`		`- DBLINK_RES_ERROR_AS_NOTICE("sql error");`
`728`	`722`	`SRF_RETURN_DONE(funcctx);`
`729`	`723`	`}`
`730`	`724`	`}`
`@@ -938,13 +932,15 @@ dblink_exec(PG_FUNCTION_ARGS)`
`938`	`932`	`* result tuple`
`939`	`933`	`*/`
`940`	`934`	`sql_cmd_status = GET_TEXT(PQcmdStatus(res));`
	`935`	`+ PQclear(res);`
`941`	`936`	`}`
`942`	`937`	`else`
	`938`	`+ {`
	`939`	`+ PQclear(res);`
`943`	`940`	`ereport(ERROR,`
`944`	`941`	`(errcode(ERRCODE_S_R_E_PROHIBITED_SQL_STATEMENT_ATTEMPTED),`
`945`	`942`	`errmsg("statement returning results not allowed")));`
`946`		`-`
`947`		`- PQclear(res);`
	`943`	`+ }`
`948`	`944`
`949`	`945`	`/* if needed, close the connection to the database and cleanup */`
`950`	`946`	`if (freeconn)`