git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

PL/Python: Fix potential NULL pointer dereference

author Peter Eisentraut <peter_e@gmx.net>

2017年11月28日 16:28:05 +0000 (11:28 -0500)

committer Peter Eisentraut <peter_e@gmx.net>

2017年11月28日 16:28:05 +0000 (11:28 -0500)

After d0aa965c0a0ac2ff7906ae1b1dad50a7952efa56, one error path in
PLy_spi_execute_fetch_result() could result in the variable "result"
being dereferenced after being set to NULL. To fix that, just clear the
resources right there and return early.

Also add another SPI_freetuptable() call so that that is cleared in all
error paths.

discovered by John Naylor <jcnaylor@gmail.com> via scan-build

src/pl/plpython/plpy_spi.c patch | blob | blame | history

diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c

index ade27f3924210b2f8a622762e53ade0f4ad0f64f..c80ccf6129b2b2d4a0c2a620d1f0c27fb7aff169 100644 (file)

--- a/src/pl/plpython/plpy_spi.c

+++ b/src/pl/plpython/plpy_spi.c

@@ -361,7 +361,10 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)

result = (PLyResultObject *) PLy_result_new();

if (!result)

+ {

+ SPI_freetuptable(tuptable);

return NULL;

+ }