Commit62546b4

committed

Revert "PL/Python: Fix potential NULL pointer dereference"

This reverts commite42e2f3.It's not safe to return in the middle of a PG_TRY block, so this willhave to be done differently.

1 parent445dbd8 commit62546b4Copy full SHA for 62546b4

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -361,10 +361,7 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)`
`361`	`361`
`362`	`362`	`result= (PLyResultObject*)PLy_result_new();`
`363`	`363`	`if (!result)`
`364`		`-{`
`365`		`-SPI_freetuptable(tuptable);`
`366`	`364`	`returnNULL;`
`367`		`-}`
`368`	`365`	`Py_DECREF(result->status);`
`369`	`366`	`result->status=PyInt_FromLong(status);`
`370`	`367`
`@@ -417,9 +414,7 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)`
`417`	`414`	`if (!result->rows)`
`418`	`415`	`{`
`419`	`416`	`Py_DECREF(result);`
`420`		`-MemoryContextDelete(cxt);`
`421`		`-SPI_freetuptable(tuptable);`
`422`		`-returnNULL;`
	`417`	`+result=NULL;`
`423`	`418`	`}`
`424`	`419`	`else`
`425`	`420`	`{`

Comments

(0)