lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-31 02:43:06 +03:00
Code Activity

fix xsltSaveResultToString comment detect loops when computing variables,

Browse Source 
* libxslt/xsltutils.c: fix xsltSaveResultToString comment
* libxslt/transform.c: detect loops when computing variables, should
  fix bug #330772
* doc/xsltproc.xml doc/xsltproc.1: fix typo in man page
* tests/namespaces/tst7.out tests/general/bug-152.out: small output
  changes due to libxml2 xhtml meta handling modification
Daniel
This commit is contained in:
Daniel Veillard
2006-02-11 12:14:10 +00:00
parent f22031d998
commit e9517d8c4a
7 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Sat Feb 11 13:10:01 CET 2006 Daniel Veillard <daniel@veillard.com>
* libxslt/xsltutils.c: fix xsltSaveResultToString comment
* libxslt/transform.c: detect loops when computing variables, should
fix bug #330772
* doc/xsltproc.xml doc/xsltproc.1: fix typo in man page
* tests/namespaces/tst7.out tests/general/bug-152.out: small output
changes due to libxml2 xhtml meta handling modification
Mon Nov 21 12:22:21 CET 2005 Daniel Veillard <daniel@veillard.com> Mon Nov 21 12:22:21 CET 2005 Daniel Veillard <daniel@veillard.com>
* libexslt/date.c: Albert Chin found another signed/unsigned problem * libexslt/date.c: Albert Chin found another signed/unsigned problem

2
doc/xsltproc.1
View File

@ -98,7 +98,7 @@ Do not use the Internet to fetch DTD's, entities or documents\&.
.TP .TP
\fB\-\-path\fR \fIpaths\fR \fB\-\-path\fR \fIpaths\fR
Use the list (separated by space or column) of filesystem paths specified by \fIpaths\fR to load DTDs, entities or documents\&. Use the list (separated by space or colon) of filesystem paths specified by \fIpaths\fR to load DTDs, entities or documents\&.
.TP .TP
\fB\-\-load\-trace\fR \fB\-\-load\-trace\fR

2
doc/xsltproc.xml
View File

@ -250,7 +250,7 @@
<term> <option>--path</option> <replaceable>paths</replaceable></term> <term> <option>--path</option> <replaceable>paths</replaceable></term>
<listitem> <listitem>
<simpara> <simpara>
Use the list (separated by space or column) of filesystem paths Use the list (separated by space or colon) of filesystem paths
specified by <replaceable>paths</replaceable> to load specified by <replaceable>paths</replaceable> to load
<acronym>DTDs</acronym>, entities or documents. <acronym>DTDs</acronym>, entities or documents.
</simpara> </simpara>

3
libxslt/transform.c
View File

@ -1554,7 +1554,8 @@ xsltApplyOneTemplateInt(xsltTransformContextPtr ctxt, xmlNodePtr node,
return; return;
CHECK_STOPPED; CHECK_STOPPED;
if (ctxt->templNr >= xsltMaxDepth) { if ((ctxt->templNr >= xsltMaxDepth) ||
(ctxt->varsNr >= 5 * xsltMaxDepth)) {
xsltTransformError(ctxt, NULL, list, xsltTransformError(ctxt, NULL, list,
"xsltApplyOneTemplate: loop found ???\n"); "xsltApplyOneTemplate: loop found ???\n");
xsltGenericError(xsltGenericErrorContext, xsltGenericError(xsltGenericErrorContext,

4
libxslt/xsltutils.c
View File

@ -1544,9 +1544,9 @@ xsltSaveResultToFd(int fd, xmlDocPtr result, xsltStylesheetPtr style) {
* @style: the stylesheet * @style: the stylesheet
* *
* Save the result @result obtained by applying the @style stylesheet * Save the result @result obtained by applying the @style stylesheet
* to a file or @URL * to a new allocated string.
* *
* Returns the number of byte written or -1 in case of failure. * Returns 0 in case of success and -1 in case of error
*/ */
int int
xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len, xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len,

3
tests/general/bug-152.out
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="US-ASCII"?> <?xml version="1.0" encoding="US-ASCII"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html; charset=US-ASCII" /> <head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII" />
<style type="text/css" media="all">@import <style type="text/css" media="all">@import
"pretty_xhtml.css";</style> "pretty_xhtml.css";</style>
</head> </head>

3
tests/namespaces/tst7.out
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title> <title>
A title A title
</title> </title>