diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-12-11 16:33:20 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-12-11 16:33:38 -0500 |
| commit | c26d46ff6d6e10e8ac1ecf80f8cf9014e3efe418 (patch) | |
| tree | 222bf552f41106c26f54dd4521bef21776e97f88 /src/backend/executor/spi.c | |
| parent | 055532badd16b01f54951559139cb664c456cb8f (diff) | |
| download | postgresql-c26d46ff6d6e10e8ac1ecf80f8cf9014e3efe418.tar.gz postgresql-c26d46ff6d6e10e8ac1ecf80f8cf9014e3efe418.zip | |
Fix corner-case coredump in _SPI_error_callback().
I noticed that _SPI_execute_plan initially sets spierrcontext.arg = NULL,
and only fills it in some time later. If an error were to happen in
between, _SPI_error_callback would try to dereference the null pointer.
This is unlikely --- there's not much between those points except
push-snapshot calls --- but it's clearly not impossible. Tweak the
callback to do nothing if the pointer isn't set yet.
It's been like this for awhile, so back-patch to all supported branches.
Diffstat (limited to 'src/backend/executor/spi.c')
| -rw-r--r-- | src/backend/executor/spi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index b809bec616d..ffa190aa838 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -2450,6 +2450,9 @@ _SPI_error_callback(void *arg) const char *query = (const char *) arg; int syntaxerrposition; + if (query == NULL) /* in case arg wasn't set yet */ + return; + /* * If there is a syntax error position, convert to internal syntax error; * otherwise treat the query as an item of context stack |