GNOME/libxml2
1
0
Fork 0
mirror of https://github.com/GNOME/libxml2.git synced 2025-10-18 00:52:00 +08:00
Code Issues Releases Wiki Activity

html: Don't escape < and > when serializing attribute values

Browse Source 
Align with HTML5.

This will break some test suites.
This commit is contained in:
Nick Wellnhofer
2025-05-09 23:02:32 +02:00
parent e0e0a1f0f5
commit cdaf657ffb
6 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
entities.c
View File

@@ -611,18 +611,21 @@ xmlEscapeText(const xmlChar *text, int flags) {
xmlChar *out; xmlChar *out;
const xmlChar *unescaped; const xmlChar *unescaped;
size_t size = 50; size_t size = 50;
int isHtmlAttr = 0;
buffer = xmlMalloc(size + 1); buffer = xmlMalloc(size + 1);
if (buffer == NULL) if (buffer == NULL)
return(NULL); return(NULL);
out = buffer; out = buffer;
if ((flags & XML_ESCAPE_HTML) && (flags & XML_ESCAPE_ATTR))
isHtmlAttr = 1;
cur = text; cur = text;
unescaped = cur; unescaped = cur;
while (*cur != '\0') { while (*cur != '\0') {
char buf[12]; char buf[12];
const xmlChar *end;
const xmlChar *repl; const xmlChar *repl;
size_t used; size_t used;
size_t replSize; size_t replSize;
@@ -649,21 +652,10 @@ xmlEscapeText(const xmlChar *text, int flags) {
chunkSize = 0; chunkSize = 0;
repl = BAD_CAST ""; repl = BAD_CAST "";
replSize = 0; replSize = 0;
} else if (c == '<') { } else if ((c == '<') && (!isHtmlAttr)) {
/* repl = BAD_CAST "&lt;";
* Special handling of server side include in HTML attributes replSize = 4;
*/ } else if ((c == '>') && (!isHtmlAttr)) {
if ((flags & XML_ESCAPE_HTML) && (flags & XML_ESCAPE_ATTR) &&
(cur[1] == '!') && (cur[2] == '-') && (cur[3] == '-') &&
((end = xmlStrstr(cur, BAD_CAST "-->")) != NULL)) {
chunkSize = (end - cur) + 3;
repl = cur;
replSize = chunkSize;
} else {
repl = BAD_CAST "&lt;";
replSize = 4;
}
} else if (c == '>') {
repl = BAD_CAST "&gt;"; repl = BAD_CAST "&gt;";
replSize = 4; replSize = 4;
} else if (c == '&') { } else if (c == '&') {

2
result/HTML/attr-ents.html
View File

@@ -3,6 +3,6 @@
<body> <body>
<a href="index.cgi?a&amp;lt=1&amp;gt=2">link</a> <a href="index.cgi?a&amp;lt=1&amp;gt=2">link</a>
<a href="index.cgi?a&amp;lta&amp;gta">link</a> <a href="index.cgi?a&amp;lta&amp;gta">link</a>
<a href="index.cgi?a&lt;&gt;">link</a> <a href="index.cgi?a<>">link</a>
</body> </body>
</html> </html>

2
result/HTML/chunked_attr.html
View File

File diff suppressed because one or more lines are too long

2
result/HTML/lt.html
View File

@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html> <html>
<head> <head>
<meta name="Author" content="Root &lt;root@aol.com&gt;"> <meta name="Author" content="Root <root@aol.com>">
</head> </head>
</html> </html>

2
result/HTML/script.html
View File

@@ -5,6 +5,6 @@
<script language="javascript"> <script language="javascript">
if (window.open<max) ; if (window.open<max) ;
</script> </script>
<input onclick="if(window.open&lt;max);"> <input onclick="if(window.open<max);">
</body> </body>
</html> </html>

2
result/HTML/utf8bug.html
View File

@@ -43,7 +43,7 @@
درباره من </a></span> <span class="Item"> درباره من </a></span> <span class="Item">
<a href="RSS2.asp"> <a href="RSS2.asp">
<img src="showimage.aspx?path=Files_Upload\192.png&amp;width=%&gt;" border="0"> <img src="showimage.aspx?path=Files_Upload\192.png&amp;width=%>" border="0">
RSS </a></span> <span class="Item"> RSS </a></span> <span class="Item">
<a href=""> <a href="">
</a></span> </a></span>