Commit6082907

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 parentae7d04a commit6082907Copy full SHA for 6082907

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

Comments

(0)