NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitf7332e8

committed

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

subsequent core dump. It looks like at one time DBLINK_RES_ERROR_AS_NOTICEdidn't include a PQclear, but now it does and so these other ones areduplicate.

1 parent1ad6878 commitf7332e8Copy full SHA for f7332e8

File tree

1 file changed

-9

lines changed

contrib/dblink
- dblink.c

1 file changed

-9

lines changed

`‎contrib/dblink/dblink.c`

Lines changed: 5 additions & 9 deletions

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)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf7332e8

File tree

1 file changed

1 file changed

`‎contrib/dblink/dblink.c`

0 commit comments