Commit8b35795

committed

Use XML output escaping also in XMLFOREST.

1 parent92dffbd commit8b35795Copy full SHA for 8b35795

File tree

-12

lines changed

-12

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.205 2007/01/10 20:33:54 petere Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.206 2007/01/12 21:47:26 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -2692,11 +2692,10 @@ ExecEvalXml(XmlExprState xmlExpr, ExprContext econtext,`
`2692`	`2692`	`value=ExecEvalExpr(e,econtext,&isnull,NULL);`
`2693`	`2693`	`if (!isnull)`
`2694`	`2694`	`{`
`2695`		`-str=OutputFunctionCall(&xmlExpr->named_outfuncs[i],`
`2696`		`-value);`
`2697`	`2695`	`appendStringInfo(&buf,"<%s>%s</%s>",`
`2698`		`-argname,str,argname);`
`2699`		`-pfree(str);`
	`2696`	`+argname,`
	`2697`	`+map_sql_value_to_xml_value(value,exprType((Node*)e->expr)),`
	`2698`	`+argname);`
`2700`	`2699`	`*isNull= false;`
`2701`	`2700`	`}`
`2702`	`2701`	`i++;`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.15 2007/01/1216:29:24 petere Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.16 2007/01/1221:47:26 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -70,8 +70,6 @@ static void xml_ereport_by_code(int level, int sqlcode,`
`70`	`70`	`staticxmlCharxml_text2xmlChar(textin);`
`71`	`71`	`staticxmlDocPtrxml_parse(text*data,boolis_document,boolpreserve_whitespace);`
`72`	`72`
`73`		`-staticchar*map_sql_value_to_xml_value(Datumvalue,Oidtype);`
`74`		`-`
`75`	`73`	`#endif/* USE_LIBXML */`
`76`	`74`
`77`	`75`	`#defineNO_XML_SUPPORT() \`
`@@ -1260,11 +1258,10 @@ map_xml_name_to_sql_identifier(char *name)`
`1260`	`1258`	`}`
`1261`	`1259`
`1262`	`1260`
`1263`		`-#ifdefUSE_LIBXML`
`1264`	`1261`	`/*`
`1265`	`1262`	`* Map SQL value to XML value; see SQL/XML:2003 section 9.16.`
`1266`	`1263`	`*/`
`1267`		`-staticchar*`
	`1264`	`+char*`
`1268`	`1265`	`map_sql_value_to_xml_value(Datumvalue,Oidtype)`
`1269`	`1266`	`{`
`1270`	`1267`	`StringInfoDatabuf;`
`@@ -1341,4 +1338,3 @@ map_sql_value_to_xml_value(Datum value, Oid type)`
`1341`	`1338`
`1342`	`1339`	`returnbuf.data;`
`1343`	`1340`	`}`
`1344`		`-#endif/* USE_LIBXML */`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.8 2007/01/10 20:33:54 petere Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.9 2007/01/12 21:47:27 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -40,5 +40,6 @@ extern xmltype xmlroot(xmltype data, text *version, int standalone);`
`40`	`40`
`41`	`41`	`externcharmap_sql_identifier_to_xml_name(charident,boolfully_escaped);`
`42`	`42`	`externcharmap_xml_name_to_sql_identifier(charname);`
	`43`	`+externchar*map_sql_value_to_xml_value(Datumvalue,Oidtype);`
`43`	`44`
`44`	`45`	`#endif/* XML_H */`

Comments

(0)