postgres.git / summary / log / commit / refs

commit    fabdad822287d6aac6a80fc57a97d38bd7456958
Author:   Tomas Vondra <tomas.vondra@postgresql.org>
Date:     Tue Dec 03 15:55:51 2019 +0000
First released in: 13.0, 9.4.26, 9.5.21, 9.6.17, 10.12, 11.7, 12.2

    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


 contrib/dict_int/dict_int.c            | 5 +++++
 contrib/dict_int/expected/dict_int.out | 2 ++
 contrib/dict_int/sql/dict_int.sql      | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c
index 935dbd4c82c..b87739e99cf 100644
--- a/contrib/dict_int/dict_int.c
+++ b/contrib/dict_int/dict_int.c
@@ -45,6 +45,11 @@ dintdict_init(PG_FUNCTION_ARGS)
 		if (pg_strcasecmp(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 (pg_strcasecmp(defel->defname, "REJECTLONG") == 0)
 		{
diff --git a/contrib/dict_int/expected/dict_int.out b/contrib/dict_int/expected/dict_int.out
index 3b766ec52ad..483e700d231 100644
--- a/contrib/dict_int/expected/dict_int.out
+++ b/contrib/dict_int/expected/dict_int.out
@@ -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
diff --git a/contrib/dict_int/sql/dict_int.sql b/contrib/dict_int/sql/dict_int.sql
index 8ffec6b7708..5c27accff4a 100644
--- a/contrib/dict_int/sql/dict_int.sql
+++ b/contrib/dict_int/sql/dict_int.sql
@@ -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);


[parent: 283f095d0bff]