sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't escape \n\t\r in xml

Browse Source 
\n especially happens rather a lot heh
This commit is contained in:
John Cupitt 2018-07-25 15:29:42 +01:00
parent 9147bb64c4
commit 2bfb471a20
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libvips/iofuncs/vips.c
View File

@ -771,8 +771,14 @@ dbuf_write_quotes( VipsDbuf *dbuf, const char *str )
} }
} }
/* Append a string to a buffer, but escape &<> and the ASCII escape codes. Our /* Append a string to a buffer, but escape stuff that xml hates in text. Our
* argument string is utf-8. * argument string is utf-8.
*
* XML rules:
*
* We must escape &<>
* Don't escape \n, \t, \r
* Do escape the other ASCII codes.
*/ */
static void static void
dbuf_write_amp( VipsDbuf *dbuf, const char *str ) dbuf_write_amp( VipsDbuf *dbuf, const char *str )
@ -780,7 +786,10 @@ dbuf_write_amp( VipsDbuf *dbuf, const char *str )
const char *p; const char *p;
for( p = str; *p; p++ ) for( p = str; *p; p++ )
if( *p < 32 ) if( *p < 32 &&
*p != '\n' &&
*p != '\t' &&
*p != '\r' )
/* You'd think we could output "&#x02%x;", but xml /* You'd think we could output "&#x02%x;", but xml
* 1.0 parsers barf on that. xml 1.1 allows this, but * 1.0 parsers barf on that. xml 1.1 allows this, but
* there are almost no parsers. * there are almost no parsers.