Skip to content

Commit 05f239e

Browse files
committed
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.
1 parent 470de6a commit 05f239e

File tree

1 file changed

+3
-0
lines changed
  • src/backend/executor

1 file changed

+3
-0
lines changed

src/backend/executor/spi.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,6 +2453,9 @@ _SPI_error_callback(void *arg)
24532453
const char *query = (const char *) arg;
24542454
int syntaxerrposition;
24552455

2456+
if (query == NULL) /* in case arg wasn't set yet */
2457+
return;
2458+
24562459
/*
24572460
* If there is a syntax error position, convert to internal syntax error;
24582461
* otherwise treat the query as an item of context stack

0 commit comments

Comments
 (0)