From: Tom Lane Date: Fri, 2 Oct 2015 19:00:52 +0000 (-0400) Subject: Add recursion depth protection to LIKE matching. X-Git-Tag: REL9_3_10~15 X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=4175cc604f6df6b0f9e9f177898a1b94e6f14aee;p=postgresql.git 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. --- diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index 605204528e4..5b8c55ebaeb 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 0c20cd173e5..640f8f2014e 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