mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure maxlen is at leat 1 in dict_int 

The dict_int text search dictionary template accepts maxlen parameter,
which is then used to cap the length of input strings. The value was
not properly checked, and the code simply does

    txt[d->maxlen] = '\0';

to insert a terminator, leading to segfaults with negative values.

This commit simply rejects values less than 1. The issue was there since
dct_int was introduced in 9.3, so backpatch all the way back to 9.4
which is the oldest supported version.

Reported-by: cili
Discussion: https://postgr.es/m/16144-a36a5bef7657047d@postgresql.org
Backpatch-through: 9.4
This commit is contained in:
Tomas Vondra 2019-12-03 16:55:51 +01:00
parent 8fd28a7baa
commit 267eb954cc
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/dict_int/dict_int.c
View File

@ -45,6 +45,11 @@ dintdict_init(PG_FUNCTION_ARGS)
if (strcmp(defel->defname, "maxlen") == 0)
{
d->maxlen = atoi(defGetString(defel));
if (d->maxlen < 1)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("maxlen value has to be >= 1")));
}
else if (strcmp(defel->defname, "rejectlong") == 0)
{

2
contrib/dict_int/expected/dict_int.out
View File

@ -300,3 +300,5 @@ select ts_lexize('intdict', '314532610153');
{314532}
(1 row)
ALTER TEXT SEARCH DICTIONARY intdict (MAXLEN = -214783648);
ERROR: maxlen value has to be >= 1

2
contrib/dict_int/sql/dict_int.sql
View File

@ -51,3 +51,5 @@ select ts_lexize('intdict', '252281774');
select ts_lexize('intdict', '313425');
select ts_lexize('intdict', '641439323669');
select ts_lexize('intdict', '314532610153');
ALTER TEXT SEARCH DICTIONARY intdict (MAXLEN = -214783648);