Commitbd1154e

committed

plperl: Fix memory leak in hek2cstr

Backpatch all the way back to 9.1, where it was introduced by commit50d89d4.Reported by Sergey Burladyan in #9223Author: Alex Hunsaker

1 parent0268d21 commitbd1154eCopy full SHA for bd1154e

File tree

+18

-2

lines changed

+18

-2

lines changed

Lines changed: 18 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -308,6 +308,16 @@ static char setlocale_perl(int category, char locale);`
`308`	`308`	`staticchar*`
`309`	`309`	`hek2cstr(HE*he)`
`310`	`310`	`{`
	`311`	`+char*ret;`
	`312`	`+SV*sv;`
	`313`	`+`
	`314`	`+/*`
	`315`	`+ * HeSVKEY_force will return a temporary mortal SV*, so we need to make`
	`316`	`+ * sure to free it with ENTER/SAVE/FREE/LEAVE`
	`317`	`+ */`
	`318`	`+ENTER;`
	`319`	`+SAVETMPS;`
	`320`	`+`
`311`	`321`	`/*-------------------------`
`312`	`322`	`* Unfortunately, while HeUTF8 is true for most things > 256, for values`
`313`	`323`	`* 128..255 it's not, but perl will treat them as unicode code points if`
`@@ -332,11 +342,17 @@ hek2cstr(HE *he)`
`332`	`342`	`* right thing`
`333`	`343`	`*-------------------------`
`334`	`344`	`*/`
`335`		`-SV*sv=HeSVKEY_force(he);`
`336`	`345`
	`346`	`+sv=HeSVKEY_force(he);`
`337`	`347`	`if (HeUTF8(he))`
`338`	`348`	`SvUTF8_on(sv);`
`339`		`-returnsv2cstr(sv);`
	`349`	`+ret=sv2cstr(sv);`
	`350`	`+`
	`351`	`+/* free sv */`
	`352`	`+FREETMPS;`
	`353`	`+LEAVE;`
	`354`	`+`
	`355`	`+returnret;`
`340`	`356`	`}`
`341`	`357`
`342`	`358`	`/*`

Comments

(0)