ardour/livetrax
13
0
Fork 0
Code

move call to xmlKeepBlanksDefault(0) to before the creation of an XML parser context

Browse Source 
the value is used by the parser context; the old code called it only after the *first* parser context
was created. therefore the first XMLTree::read() call has its behavior determined by libxml2's default
for this value, rather than by our explicit choice (do not treat whitespace as a note). All subequent
read() calls will use our value.

This variable inside libxml2 is actually per-thread, which just increases the stakes for calling
xmlKeepBlanksDefault() at the right time
This commit is contained in:
Paul Davis 2020-01-05 17:49:35 -07:00
parent 7570b9a594
commit df3a4ed9c6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/pbd/xml++.cc
View File

@ -85,13 +85,17 @@ XMLTree::read_internal(bool validate)
_doc = 0; _doc = 0;
} }
/* Calling this prevents libxml2 from treating whitespace as active
nodes. It needs to be called before we create a parser context.
*/
xmlKeepBlanksDefault(0);
/* create a parser context */ /* create a parser context */
xmlParserCtxtPtr ctxt = xmlNewParserCtxt(); xmlParserCtxtPtr ctxt = xmlNewParserCtxt();
if (ctxt == NULL) { if (ctxt == NULL) {
return false; return false;
} }
xmlKeepBlanksDefault(0);
/* parse the file, activating the DTD validation option */ /* parse the file, activating the DTD validation option */
if (validate) { if (validate) {
_doc = xmlCtxtReadFile(ctxt, _filename.c_str(), NULL, XML_PARSE_DTDVALID); _doc = xmlCtxtReadFile(ctxt, _filename.c_str(), NULL, XML_PARSE_DTDVALID);