Fix memory leak for hashing with nondeterministic collations.

jeff-davis · jeff-davis · commit 9377b4f30a14 · 2022-12-01T11:55:59.000-08:00
Backpatch through 12, where nondeterministic collations were introduced (5e1963f). Backpatch-through: 12
diff --git 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
@@ -1030,6 +1030,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);
 
@@ -1091,6 +1092,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));
 
