database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Fix corner-case coredump in _SPI_error_callback().

Browse Source 
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.
This commit is contained in:
Tom Lane
2017-12-11 16:33:20 -05:00
parent d78c3ca0ea
commit 239b01e313
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/executor/spi.c
View File

@@ -2419,6 +2419,9 @@ _SPI_error_callback(void *arg)
const char *query = (const char *) arg; const char *query = (const char *) arg;
int syntaxerrposition; 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; * If there is a syntax error position, convert to internal syntax error;
* otherwise treat the query as an item of context stack * otherwise treat the query as an item of context stack