diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-10-02 15:00:52 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-10-02 15:00:52 -0400 |
| commit | 57bf7b54831b68f63cea006b988e82cccb3469de (patch) | |
| tree | dd91d0b8bffb06e5af8c823b1c7cc42b9fbc838a | |
| parent | a0c089f33f2909663a369eead7877eb6317d31f3 (diff) | |
Add recursion depth protection to LIKE matching.
Since MatchText() recurses, it could in principle be driven to stack
overflow, although quite a long pattern would be needed.
| -rw-r--r-- | src/backend/utils/adt/like.c | 1 | ||||
| -rw-r--r-- | src/backend/utils/adt/like_match.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index 6e2aa9a86dc..845931d998d 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -21,6 +21,7 @@ #include "catalog/pg_collation.h" #include "mb/pg_wchar.h" +#include "miscadmin.h" #include "utils/builtins.h" #include "utils/pg_locale.h" diff --git a/src/backend/utils/adt/like_match.c b/src/backend/utils/adt/like_match.c index fcd36f09ee1..89814a4b56c 100644 --- a/src/backend/utils/adt/like_match.c +++ b/src/backend/utils/adt/like_match.c @@ -83,6 +83,9 @@ MatchText(char *t, int tlen, char *p, int plen, if (plen == 1 && *p == '%') return LIKE_TRUE; + /* Since this function recurses, it could be driven to stack overflow */ + check_stack_depth(); + /* * In this loop, we advance by char when matching wildcards (and thus on * recursive entry to this function we are properly char-synced). On other |