]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Make pg_regexec() robust against out-of-range search_start.
authorTom Lane <tgl@sss.pgh.pa.us>
Sat, 11 Sep 2021 19:19:31 +0000 (15:19 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Sat, 11 Sep 2021 19:20:12 +0000 (15:20 -0400)
If search_start is greater than the length of the string, we should just
return REG_NOMATCH immediately.  (Note that the equality case should
*not* be rejected, since the pattern might be able to match zero
characters.)  This guards various internal assumptions that the min of a
range of string positions is not more than the max.  Violation of those
assumptions could allow an attempt to fetch string[search_start-1],
possibly causing a crash.

Jaime Casanova pointed out that this situation is reachable with the
new regexp_xxx functions that accept a user-specified start position.
I don't believe it's reachable via any in-core call site in v14 and
below.  However, extensions could possibly call pg_regexec with an
out-of-range search_start, so let's back-patch the fix anyway.

Discussion: https://postgr.es/m/20210911180357.GA6870@ahch-to

src/backend/regex/regexec.c

index 3e931e008869487d15719616e454f8a9258aa909..d319d40f2494b5e256eee45f934ac854de1a7d5d 100644 (file)
@@ -196,6 +196,8 @@ pg_regexec(regex_t *re,
                return REG_INVARG;
        if (re->re_csize != sizeof(chr))
                return REG_MIXED;
+       if (search_start > len)
+               return REG_NOMATCH;
 
        /* Initialize locale-dependent support */
        pg_set_regex_collation(re->re_collation);