Commit 8b569280 authored by Tom Lane's avatar Tom Lane

Add a stack overflow check to copyObject().

There are some code paths, such as SPI_execute(), where we invoke
copyObject() on raw parse trees before doing parse analysis on them.  Since
the bison grammar is capable of building heavily nested parsetrees while
itself using only minimal stack depth, this means that copyObject() can be
the front-line function that hits stack overflow before anything else does.
Accordingly, it had better have a check_stack_depth() call.  I did a bit of
performance testing and found that this slows down copyObject() by only a
few percent, so the hit ought to be negligible in the context of complete
processing of a query.

Per off-list report from Toshihide Katayama.  Back-patch to all supported
branches.
parent af1a614e
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "postgres.h" #include "postgres.h"
#include "miscadmin.h"
#include "nodes/plannodes.h" #include "nodes/plannodes.h"
#include "nodes/relation.h" #include "nodes/relation.h"
#include "utils/datum.h" #include "utils/datum.h"
...@@ -3667,6 +3668,9 @@ copyObject(void *from) ...@@ -3667,6 +3668,9 @@ copyObject(void *from)
if (from == NULL) if (from == NULL)
return NULL; return NULL;
/* Guard against stack overflow due to overly complex expressions */
check_stack_depth();
switch (nodeTag(from)) switch (nodeTag(from))
{ {
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment