Fix memory leak for hashing with nondeterministic collations.

Backpatch through 12, where nondeterministic collations were
introduced (5e1963fb76).

Backpatch-through: 12

diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c
index 06141d853fa1dbc6f3ba5a2e1f87cb7e4541add2..961d069c381e74c3b3e3c59c3792116936f85e93 100644 (file)
--- a/src/backend/access/hash/hashfunc.c
+++ b/src/backend/access/hash/hashfunc.c
@@ -303,6 +303,7 @@ hashtext(PG_FUNCTION_ARGS)
            buf = palloc(bsize);
            ucol_getSortKey(mylocale->info.icu.ucol,
                            uchar, ulen, buf, bsize);
+           pfree(uchar);
 
            result = hash_any(buf, bsize);
 
@@ -360,6 +361,7 @@ hashtextextended(PG_FUNCTION_ARGS)
            buf = palloc(bsize);
            ucol_getSortKey(mylocale->info.icu.ucol,
                            uchar, ulen, buf, bsize);
+           pfree(uchar);
 
            result = hash_any_extended(buf, bsize, PG_GETARG_INT64(1));
 

diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index b595ab9569cfd768d76e75a4c0ac50f0e995c992..7144622df8a66ad9a3df152e0bdfec827e6f04a1 100644 (file)
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -1020,6 +1020,7 @@ hashbpchar(PG_FUNCTION_ARGS)
            buf = palloc(bsize);
            ucol_getSortKey(mylocale->info.icu.ucol,
                            uchar, ulen, buf, bsize);
+           pfree(uchar);
 
            result = hash_any(buf, bsize);
 
@@ -1081,6 +1082,7 @@ hashbpcharextended(PG_FUNCTION_ARGS)
            buf = palloc(bsize);
            ucol_getSortKey(mylocale->info.icu.ucol,
                            uchar, ulen, buf, bsize);
+           pfree(uchar);
 
            result = hash_any_extended(buf, bsize, PG_GETARG_INT64(1));