postgres.git / summary / log / commit / refs

commit    63ac5b0b67a5ea23d24ee745397d39fcf1f77bcc
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Tue Jun 05 00:13:04 2012 +0000
First released in: 9.2.0, 8.3.20, 8.4.13, 9.0.9, 9.1.5

    Fix some more bugs in contrib/xml2's xslt_process().
    
    It failed to check for error return from xsltApplyStylesheet(), as reported
    by Peter Gagarinov.  (So far as I can tell, libxslt provides no convenient
    way to get a useful error message in failure cases.  There might be some
    inconvenient way, but considering that this code is deprecated it's hard to
    get 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 by
    xsltSaveResultToString was never freed, resulting in a session-lifespan
    memory leak.
    
    Back-patch to all supported versions.


 contrib/xml2/xslt_proc.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/contrib/xml2/xslt_proc.c b/contrib/xml2/xslt_proc.c
index a51b8c1516a..5e4b7a61b4e 100644
--- a/contrib/xml2/xslt_proc.c
+++ b/contrib/xml2/xslt_proc.c
@@ -58,6 +58,7 @@ xslt_process(PG_FUNCTION_ARGS)
 
 	text	   *doct = PG_GETARG_TEXT_P(0);
 	text	   *ssheet = PG_GETARG_TEXT_P(1);
+	text	   *result;
 	text	   *paramstr;
 	const char *params[MAXPARAMS + 1];	/* +1 for the terminator */
 	xsltStylesheetPtr stylesheet = NULL;
@@ -118,6 +119,16 @@ xslt_process(PG_FUNCTION_ARGS)
 	}
 
 	restree = xsltApplyStylesheet(stylesheet, doctree, params);
+
+	if (restree == NULL)
+	{
+		xsltFreeStylesheet(stylesheet);
+		xmlFreeDoc(doctree);
+		xsltCleanupGlobals();
+		xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+					"failed to apply stylesheet");
+	}
+
 	resstat = xsltSaveResultToString(&resstr, &reslen, restree, stylesheet);
 
 	xsltFreeStylesheet(stylesheet);
@@ -126,10 +137,16 @@ xslt_process(PG_FUNCTION_ARGS)
 
 	xsltCleanupGlobals();
 
+	/* XXX this is pretty dubious, really ought to throw error instead */
 	if (resstat < 0)
 		PG_RETURN_NULL();
 
-	PG_RETURN_TEXT_P(cstring_to_text_with_len((char *) resstr, reslen));
+	result = cstring_to_text_with_len((char *) resstr, reslen);
+
+	if (resstr)
+		xmlFree(resstr);
+
+	PG_RETURN_TEXT_P(result);
 
 #else /* !USE_LIBXSLT */
 


[parent: 46ceb398f09e]