Commit47e1224

committed

Fix memory leak for hashing with nondeterministic collations.

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

1 parent7ec2bfe commit47e1224Copy full SHA for 47e1224

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
`@@ -1020,6 +1020,7 @@ hashbpchar(PG_FUNCTION_ARGS)`
`1020`	`1020`	`buf=palloc(bsize);`
`1021`	`1021`	`ucol_getSortKey(mylocale->info.icu.ucol,`
`1022`	`1022`	`uchar,ulen,buf,bsize);`
	`1023`	`+pfree(uchar);`
`1023`	`1024`
`1024`	`1025`	`result=hash_any(buf,bsize);`
`1025`	`1026`
`@@ -1081,6 +1082,7 @@ hashbpcharextended(PG_FUNCTION_ARGS)`
`1081`	`1082`	`buf=palloc(bsize);`
`1082`	`1083`	`ucol_getSortKey(mylocale->info.icu.ucol,`
`1083`	`1084`	`uchar,ulen,buf,bsize);`
	`1085`	`+pfree(uchar);`
`1084`	`1086`
`1085`	`1087`	`result=hash_any_extended(buf,bsize,PG_GETARG_INT64(1));`
`1086`	`1088`

Comments

(0)