Commitb48ecf8

committed

In bttext_abbrev_convert, move pfree to the right place.

Without this, we might access memory that's already been freed, orleak memory if in the C locale.Peter Geoghegan

1 parent47fe4d2 commitb48ecf8Copy full SHA for b48ecf8

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2034,13 +2034,9 @@ bttext_abbrev_convert(Datum original, SortSupport ssup)`
`2034`	`2034`	`}`
`2035`	`2035`
`2036`	`2036`	`/* Just like strcoll(), strxfrm() expects a NUL-terminated string */`
`2037`		`-memcpy(tss->buf1,VARDATA_ANY(authoritative),len);`
	`2037`	`+memcpy(tss->buf1,authoritative_data,len);`
`2038`	`2038`	`tss->buf1[len]='\0';`
`2039`	`2039`
`2040`		`-/* Don't leak memory here */`
`2041`		`-if (PointerGetDatum(authoritative)!=original)`
`2042`		`-pfree(authoritative);`
`2043`		`-`
`2044`	`2040`	`for (;;)`
`2045`	`2041`	`{`
`2046`	`2042`	`#ifdefHAVE_LOCALE_T`
`@@ -2108,6 +2104,10 @@ bttext_abbrev_convert(Datum original, SortSupport ssup)`
`2108`	`2104`
`2109`	`2105`	`addHyperLogLog(&tss->abbr_card,hash);`
`2110`	`2106`
	`2107`	`+/* Don't leak memory here */`
	`2108`	`+if (PointerGetDatum(authoritative)!=original)`
	`2109`	`+pfree(authoritative);`
	`2110`	`+`
`2111`	`2111`	`returnres;`
`2112`	`2112`	`}`
`2113`	`2113`

Comments

(0)