Fix crash on compiling a regular expression with more than 32k colors.

Throw an error instead.

Backpatch to all supported branches.

diff --git a/src/backend/regex/regc_color.c b/src/backend/regex/regc_color.c
index 99c28505ae92213967afdcb13205c924acc9d999..846f24f7c284742f6499932d2dc267e95e371185 100644 (file)
--- a/src/backend/regex/regc_color.c
+++ b/src/backend/regex/regc_color.c
@@ -247,7 +247,15 @@ newcolor(struct colormap * cm)
        /* oops, must allocate more */
        struct colordesc *newCd;
 
+       if (cm->max == MAX_COLOR)
+       {
+           CERR(REG_ECOLORS);
+           return COLORLESS;   /* too many colors */
+       }
+
        n = cm->ncds * 2;
+       if (n > MAX_COLOR + 1)
+           n = MAX_COLOR + 1;
        if (cm->cd == cm->cdspace)
        {
            newCd = (struct colordesc *) MALLOC(n * sizeof(struct colordesc));

diff --git a/src/include/regex/regerrs.h b/src/include/regex/regerrs.h
index b8cc1f3da73f46a2368c30fee40bd82b63d40c9c..15da324b66041534117169c7e6c3f54a889333a7 100644 (file)
--- a/src/include/regex/regerrs.h
+++ b/src/include/regex/regerrs.h
@@ -77,3 +77,7 @@
 {
    REG_ETOOBIG, "REG_ETOOBIG", "nfa has too many states"
 },
+
+{
+   REG_ECOLORS, "REG_ECOLORS", "too many colors"
+},

diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h
index 52857a2889444c04d749c948db96e65f12609037..0ab02203124b7acf3d517f32ef815ea0a3c49833 100644 (file)
--- a/src/include/regex/regex.h
+++ b/src/include/regex/regex.h
@@ -152,6 +152,7 @@ typedef struct
 #define REG_MIXED  17          /* character widths of regex and string differ */
 #define REG_BADOPT 18          /* invalid embedded option */
 #define REG_ETOOBIG 19         /* nfa has too many states */
+#define REG_ECOLORS 20         /* too many colors */
 /* two specials for debugging and testing */
 #define REG_ATOI   101         /* convert error-code name to number */
 #define REG_ITOA   102         /* convert error-code number to name */

diff --git a/src/include/regex/regguts.h b/src/include/regex/regguts.h
index 973e99a0823b8c3100d516aa00b612c2200854b1..9cd0ef9fdf6d07fa30d65c0729c68241a68fb1a4 100644 (file)
--- a/src/include/regex/regguts.h
+++ b/src/include/regex/regguts.h
@@ -148,6 +148,7 @@
 typedef short color;           /* colors of characters */
 typedef int pcolor;                /* what color promotes to */
 
+#define MAX_COLOR  32767       /* max color (must fit in 'color' datatype) */
 #define COLORLESS  (-1)        /* impossible color */
 #define WHITE      0           /* default color, parent of all others */