Commitbf2b0a1

committed

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

Throw an error instead.Backpatch to all supported branches.

1 parentd7d5832 commitbf2b0a1Copy full SHA for bf2b0a1

File tree

+14

-0

lines changed

+14

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,15 @@ newcolor(struct colormap * cm)`
`247`	`247`	`/* oops, must allocate more */`
`248`	`248`	`structcolordesc*newCd;`
`249`	`249`
	`250`	`+if (cm->max==MAX_COLOR)`
	`251`	`+{`
	`252`	`+CERR(REG_ECOLORS);`
	`253`	`+returnCOLORLESS;/* too many colors */`
	`254`	`+}`
	`255`	`+`
`250`	`256`	`n=cm->ncds*2;`
	`257`	`+if (n>MAX_COLOR+1)`
	`258`	`+n=MAX_COLOR+1;`
`251`	`259`	`if (cm->cd==cm->cdspace)`
`252`	`260`	`{`
`253`	`261`	`newCd= (structcolordesc)MALLOC(nsizeof(structcolordesc));`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,3 +77,7 @@`
`77`	`77`	`{`
`78`	`78`	`REG_ETOOBIG,"REG_ETOOBIG","nfa has too many states"`
`79`	`79`	`},`
	`80`	`+`
	`81`	`+{`
	`82`	`+REG_ECOLORS,"REG_ECOLORS","too many colors"`
	`83`	`+},`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ typedef struct`
`153`	`153`	`#defineREG_MIXED17/* character widths of regex and string differ */`
`154`	`154`	`#defineREG_BADOPT18/* invalid embedded option */`
`155`	`155`	`#defineREG_ETOOBIG 19/* nfa has too many states */`
	`156`	`+#defineREG_ECOLORS 20/* too many colors */`
`156`	`157`	`/* two specials for debugging and testing */`
`157`	`158`	`#defineREG_ATOI101/* convert error-code name to number */`
`158`	`159`	`#defineREG_ITOA102/* convert error-code number to name */`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@`
`148`	`148`	`typedefshortcolor;/* colors of characters */`
`149`	`149`	`typedefintpcolor;/* what color promotes to */`
`150`	`150`
	`151`	`+#defineMAX_COLOR32767/* max color (must fit in 'color' datatype) */`
`151`	`152`	`#defineCOLORLESS(-1)/* impossible color */`
`152`	`153`	`#defineWHITE0/* default color, parent of all others */`
`153`	`154`

Comments

(0)