Commitedf12e7

committed

Fix memory leak for hashing with nondeterministic collations.

Backpatch through 12, where nondeterministic collations wereintroduced (5e1963f).Backpatch-through: 12

1 parenta109a0b commitedf12e7Copy full SHA for edf12e7

File tree

-0

lines changed

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,7 @@ hashtext(PG_FUNCTION_ARGS)`
`303`	`303`	`buf=palloc(bsize);`
`304`	`304`	`ucol_getSortKey(mylocale->info.icu.ucol,`
`305`	`305`	`uchar,ulen,buf,bsize);`
	`306`	`+pfree(uchar);`
`306`	`307`
`307`	`308`	`result=hash_any(buf,bsize);`
`308`	`309`
`@@ -360,6 +361,7 @@ hashtextextended(PG_FUNCTION_ARGS)`
`360`	`361`	`buf=palloc(bsize);`
`361`	`362`	`ucol_getSortKey(mylocale->info.icu.ucol,`
`362`	`363`	`uchar,ulen,buf,bsize);`
	`364`	`+pfree(uchar);`
`363`	`365`
`364`	`366`	`result=hash_any_extended(buf,bsize,PG_GETARG_INT64(1));`
`365`	`367`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1031,6 +1031,7 @@ hashbpchar(PG_FUNCTION_ARGS)`
`1031`	`1031`	`buf=palloc(bsize);`
`1032`	`1032`	`ucol_getSortKey(mylocale->info.icu.ucol,`
`1033`	`1033`	`uchar,ulen,buf,bsize);`
	`1034`	`+pfree(uchar);`
`1034`	`1035`
`1035`	`1036`	`result=hash_any(buf,bsize);`
`1036`	`1037`
`@@ -1092,6 +1093,7 @@ hashbpcharextended(PG_FUNCTION_ARGS)`
`1092`	`1093`	`buf=palloc(bsize);`
`1093`	`1094`	`ucol_getSortKey(mylocale->info.icu.ucol,`
`1094`	`1095`	`uchar,ulen,buf,bsize);`
	`1096`	`+pfree(uchar);`
`1095`	`1097`
`1096`	`1098`	`result=hash_any_extended(buf,bsize,PG_GETARG_INT64(1));`
`1097`	`1099`

Comments

(0)