Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd9d7214

Browse files
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 parent873d1c1 commitd9d7214

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

‎contrib/xml2/xslt_proc.c

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ xslt_process(PG_FUNCTION_ARGS)
5454

5555
text*doct=PG_GETARG_TEXT_P(0);
5656
text*ssheet=PG_GETARG_TEXT_P(1);
57+
text*result;
5758
text*paramstr;
5859
constchar**params;
5960
xsltStylesheetPtrstylesheet=NULL;
@@ -117,6 +118,16 @@ xslt_process(PG_FUNCTION_ARGS)
117118
}
118119

119120
restree=xsltApplyStylesheet(stylesheet,doctree,params);
121+
122+
if (restree==NULL)
123+
{
124+
xsltFreeStylesheet(stylesheet);
125+
xmlFreeDoc(doctree);
126+
xsltCleanupGlobals();
127+
xml_ereport(ERROR,ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
128+
"failed to apply stylesheet");
129+
}
130+
120131
resstat=xsltSaveResultToString(&resstr,&reslen,restree,stylesheet);
121132

122133
xsltFreeStylesheet(stylesheet);
@@ -125,10 +136,16 @@ xslt_process(PG_FUNCTION_ARGS)
125136

126137
xsltCleanupGlobals();
127138

139+
/* XXX this is pretty dubious, really ought to throw error instead */
128140
if (resstat<0)
129141
PG_RETURN_NULL();
130142

131-
PG_RETURN_TEXT_P(cstring_to_text_with_len((char*)resstr,reslen));
143+
result=cstring_to_text_with_len((char*)resstr,reslen);
144+
145+
if (resstr)
146+
xmlFree(resstr);
147+
148+
PG_RETURN_TEXT_P(result);
132149
#else/* !USE_LIBXSLT */
133150

134151
ereport(ERROR,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp