NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitc3ccc9e

committed

Fix possible buffer overrun in contrib/pg_trgm.

Allow for the possibility that folding a string to lower case makes itlonger (due to replacing a character with a longer multibyte character).This doesn't change the number of trigrams that will be extracted, butit does affect the required size of an intermediate buffer ingenerate_trgm(). Per bug #8821 from Ufuk Kayserilioglu.Also install some checks that the input string length is not so largeas to cause overflow in the calculations of palloc request sizes.Back-patch to all supported versions.

1 parent866a1f0 commitc3ccc9eCopy full SHA for c3ccc9e

File tree

1 file changed

+35

-3

lines changed

contrib/pg_trgm
- trgm_op.c

1 file changed

+35

-3

lines changed

`‎contrib/pg_trgm/trgm_op.c`

Lines changed: 35 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`#include"catalog/pg_type.h"`
`11`	`11`	`#include"tsearch/ts_locale.h"`
	`12`	`+#include"utils/memutils.h"`
`12`	`13`
`13`	`14`
`14`	`15`	`PG_MODULE_MAGIC;`
`@@ -188,6 +189,18 @@ generate_trgm(char *str, int slen)`
`188`	`189`	`char*bword,`
`189`	`190`	`*eword;`
`190`	`191`
	`192`	`+/*`
	`193`	`+ * Guard against possible overflow in the palloc requests below. (We`
	`194`	`+ * don't worry about the additive constants, since palloc can detect`
	`195`	`+ * requests that are a little above MaxAllocSize --- we just need to`
	`196`	`+ * prevent integer overflow in the multiplications.)`
	`197`	`+ */`
	`198`	`+if ((Size) (slen /2) >= (MaxAllocSize / (sizeof(trgm)*3))\|\|`
	`199`	`+(Size)slen >= (MaxAllocSize /pg_database_encoding_max_length()))`
	`200`	`+ereport(ERROR,`
	`201`	`+(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
	`202`	`+errmsg("out of memory")));`
	`203`	`+`
`191`	`204`	`trg= (TRGM)palloc(TRGMHDRSIZE+sizeof(trgm) (slen /2+1)*3);`
`192`	`205`	`trg->flag=ARRKEY;`
`193`	`206`	`SET_VARSIZE(trg,TRGMHDRSIZE);`
`@@ -197,7 +210,8 @@ generate_trgm(char *str, int slen)`
`197`	`210`
`198`	`211`	`tptr=GETARR(trg);`
`199`	`212`
`200`		`-buf=palloc(sizeof(char)* (slen+4));`
	`213`	`+/* Allocate a buffer for case-folded, blank-padded words */`
	`214`	`+buf= (char)palloc(slenpg_database_encoding_max_length()+4);`
`201`	`215`
`202`	`216`	`if (LPADDING>0)`
`203`	`217`	`{`
`@@ -221,6 +235,7 @@ generate_trgm(char *str, int slen)`
`221`	`235`	`#ifdefIGNORECASE`
`222`	`236`	`pfree(bword);`
`223`	`237`	`#endif`
	`238`	`+`
`224`	`239`	`buf[LPADDING+bytelen]=' ';`
`225`	`240`	`buf[LPADDING+bytelen+1]=' ';`
`226`	`241`
`@@ -236,7 +251,10 @@ generate_trgm(char *str, int slen)`
`236`	`251`	`if ((len=tptr-GETARR(trg))==0)`
`237`	`252`	`returntrg;`
`238`	`253`
`239`		`-if (len>0)`
	`254`	`+/*`
	`255`	`+ * Make trigrams unique.`
	`256`	`+ */`
	`257`	`+if (len>1)`
`240`	`258`	`{`
`241`	`259`	`qsort((void*)GETARR(trg),len,sizeof(trgm),comp_trgm);`
`242`	`260`	`len=unique_array(GETARR(trg),len);`
`@@ -419,6 +437,18 @@ generate_wildcard_trgm(const char *str, int slen)`
`419`	`437`	`bytelen;`
`420`	`438`	`constchar*eword;`
`421`	`439`
	`440`	`+/*`
	`441`	`+ * Guard against possible overflow in the palloc requests below. (We`
	`442`	`+ * don't worry about the additive constants, since palloc can detect`
	`443`	`+ * requests that are a little above MaxAllocSize --- we just need to`
	`444`	`+ * prevent integer overflow in the multiplications.)`
	`445`	`+ */`
	`446`	`+if ((Size) (slen /2) >= (MaxAllocSize / (sizeof(trgm)*3))\|\|`
	`447`	`+(Size)slen >= (MaxAllocSize /pg_database_encoding_max_length()))`
	`448`	`+ereport(ERROR,`
	`449`	`+(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
	`450`	`+errmsg("out of memory")));`
	`451`	`+`
`422`	`452`	`trg= (TRGM)palloc(TRGMHDRSIZE+sizeof(trgm) (slen /2+1)*3);`
`423`	`453`	`trg->flag=ARRKEY;`
`424`	`454`	`SET_VARSIZE(trg,TRGMHDRSIZE);`
`@@ -428,6 +458,7 @@ generate_wildcard_trgm(const char *str, int slen)`
`428`	`458`
`429`	`459`	`tptr=GETARR(trg);`
`430`	`460`
	`461`	`+/* Allocate a buffer for blank-padded, but not yet case-folded, words */`
`431`	`462`	`buf=palloc(sizeof(char)* (slen+4));`
`432`	`463`
`433`	`464`	`/*`
`@@ -448,6 +479,7 @@ generate_wildcard_trgm(const char *str, int slen)`
`448`	`479`	`* count trigrams`
`449`	`480`	`*/`
`450`	`481`	`tptr=make_trigrams(tptr,buf2,bytelen,charlen);`
	`482`	`+`
`451`	`483`	`#ifdefIGNORECASE`
`452`	`484`	`pfree(buf2);`
`453`	`485`	`#endif`
`@@ -461,7 +493,7 @@ generate_wildcard_trgm(const char *str, int slen)`
`461`	`493`	`/*`
`462`	`494`	`* Make trigrams unique.`
`463`	`495`	`*/`
`464`		`-if (len>0)`
	`496`	`+if (len>1)`
`465`	`497`	`{`
`466`	`498`	`qsort((void*)GETARR(trg),len,sizeof(trgm),comp_trgm);`
`467`	`499`	`len=unique_array(GETARR(trg),len);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc3ccc9e

File tree

1 file changed

1 file changed

`‎contrib/pg_trgm/trgm_op.c`

0 commit comments