diff options
author | Jeff Davis <jdavis@postgresql.org> | 2022-12-01 11:26:32 -0800 |
---|---|---|
committer | Jeff Davis <jdavis@postgresql.org> | 2022-12-01 11:49:43 -0800 |
commit | f98c4fb1dd8d117b719963677f0be002cbc5129b (patch) | |
tree | d737bb649e76cb7fa248d82c98c4fa91ee5481b9 | |
parent | af6a76931634780fd5a67f2e1dee84a269e1f14a (diff) |
Fix memory leak for hashing with nondeterministic collations.
Backpatch through 12, where nondeterministic collations were
introduced (5e1963fb76).
Backpatch-through: 12
-rw-r--r-- | src/backend/access/hash/hashfunc.c | 2 | ||||
-rw-r--r-- | src/backend/utils/adt/varchar.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c index a43edfe0cc8..5a9ee7d1099 100644 --- 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 416c73f7286..1540d36c4ca 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -1021,6 +1021,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); @@ -1082,6 +1083,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)); |