database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Back-patch addition of stack overflow and interrupt checks for lquery.

Browse Source 
Experimentation shows that it's not hard at all to drive the
old implementation of "ltree ~ lquery" match to stack overflow,
so throw in a check_stack_depth() call, as I just did in HEAD.

I wasn't able to make it take a long time, because all the
pathological cases I tried hit stack overflow first; but
I bet there are some others that do take a long time, so add
CHECK_FOR_INTERRUPTS() too.

Discussion: https://postgr.es/m/CAP_rww=waX2Oo6q+MbMSiZ9ktdj6eaJj0cQzNu=Ry2cCDij5fw@mail.gmail.com
This commit is contained in:
Tom Lane 2020-03-31 11:37:44 -04:00
parent f15f5edee5
commit e48ff22d39
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/ltree/lquery_op.c
View File

@ -8,6 +8,7 @@
#include <ctype.h> #include <ctype.h>
#include "catalog/pg_collation.h" #include "catalog/pg_collation.h"
#include "miscadmin.h"
#include "utils/formatting.h" #include "utils/formatting.h"
#include "ltree.h" #include "ltree.h"
@ -165,6 +166,12 @@ checkCond(lquery_level *curq, int query_numlevel, ltree_level *curt, int tree_nu
lquery_level *prevq = NULL; lquery_level *prevq = NULL;
ltree_level *prevt = NULL; ltree_level *prevt = NULL;
/* Since this function recurses, it could be driven to stack overflow */
check_stack_depth();
/* Pathological patterns could take awhile, too */
CHECK_FOR_INTERRUPTS();
if (SomeStack.muse) if (SomeStack.muse)
{ {
high_pos = SomeStack.high_pos; high_pos = SomeStack.high_pos;