Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e3d194f

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 22e71b3 commit e3d194f

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
@@ -2365,6 +2365,9 @@ _SPI_error_callback(void *arg)
23652365
const char *query = (const char *) arg;
23662366
int syntaxerrposition;
23672367

2368+
if (query == NULL) /* in case arg wasn't set yet */
2369+
return;
2370+
23682371
/*
23692372
* If there is a syntax error position, convert to internal syntax error;
23702373
* otherwise treat the query as an item of context stack

0 commit comments

Comments
 (0)