NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commitd9b31e4

committed

Fix some more bugs in contrib/xml2's xslt_process().

It failed to check for error return from xsltApplyStylesheet(), as reportedby Peter Gagarinov. (So far as I can tell, libxslt provides no convenientway to get a useful error message in failure cases. There might be someinconvenient way, but considering that this code is deprecated it's hard toget enthusiastic about putting lots of work into it. So I just made it say"failed to apply stylesheet", in line with the existing error checks.)While looking at the code I also noticed that the string returned byxsltSaveResultToString was never freed, resulting in a session-lifespanmemory leak.Back-patch to all supported versions.

1 parentd73b7f9 commitd9b31e4Copy full SHA for d9b31e4

File tree

1 file changed

+13

-1

lines changed

contrib/xml2
- xslt_proc.c

1 file changed

+13

-1

lines changed

`‎contrib/xml2/xslt_proc.c‎`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ xslt_process(PG_FUNCTION_ARGS)`
`54`	`54`
`55`	`55`	`text*doct=PG_GETARG_TEXT_P(0);`
`56`	`56`	`text*ssheet=PG_GETARG_TEXT_P(1);`
	`57`	`+text*result;`
`57`	`58`	`text*paramstr;`
`58`	`59`	`constchar**params;`
`59`	`60`	`PgXmlErrorContext*xmlerrcxt;`
`@@ -112,6 +113,11 @@ xslt_process(PG_FUNCTION_ARGS)`
`112`	`113`	`"failed to parse stylesheet");`
`113`	`114`
`114`	`115`	`restree=xsltApplyStylesheet(stylesheet,doctree,params);`
	`116`	`+`
	`117`	`+if (restree==NULL)`
	`118`	`+xml_ereport(xmlerrcxt,ERROR,ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,`
	`119`	`+"failed to apply stylesheet");`
	`120`	`+`
`115`	`121`	`resstat=xsltSaveResultToString(&resstr,&reslen,restree,stylesheet);`
`116`	`122`	`}`
`117`	`123`	`PG_CATCH();`
`@@ -137,10 +143,16 @@ xslt_process(PG_FUNCTION_ARGS)`
`137`	`143`
`138`	`144`	`pg_xml_done(xmlerrcxt, false);`
`139`	`145`
	`146`	`+/* XXX this is pretty dubious, really ought to throw error instead */`
`140`	`147`	`if (resstat<0)`
`141`	`148`	`PG_RETURN_NULL();`
`142`	`149`
`143`		`-PG_RETURN_TEXT_P(cstring_to_text_with_len((char*)resstr,reslen));`
	`150`	`+result=cstring_to_text_with_len((char*)resstr,reslen);`
	`151`	`+`
	`152`	`+if (resstr)`
	`153`	`+xmlFree(resstr);`
	`154`	`+`
	`155`	`+PG_RETURN_TEXT_P(result);`
`144`	`156`	`#else/* !USE_LIBXSLT */`
`145`	`157`
`146`	`158`	`ereport(ERROR,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd9b31e4

File tree

1 file changed

1 file changed

`‎contrib/xml2/xslt_proc.c‎`

0 commit comments