diff options
| author | Tom Lane | 2017-12-11 21:33:20 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-12-11 21:33:49 +0000 |
| commit | 239b01e313b5c3bc90d383b0a345e0549fe9ba96 (patch) | |
| tree | 59b9ce22f753c21ac9eff05f83f9a90c13f0a3d7 /src | |
| parent | d78c3ca0ea1012d9c944bae981b13151e4f86dcb (diff) | |
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')
| -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 f8a9b529685..2beb6932ff5 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -2419,6 +2419,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 |