summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2016-08-23 17:23:14 (GMT)
committer Chris Young <chris@unsatisfactorysoftware.co.uk>2016-08-23 17:23:14 (GMT)
commit21154af546747dd02ea8d6f0ee5332ba5fcd3acb (patch)
treec7cbb83b3b00447ab06d94bd43d622e0aba11a0c
parent1231bc489c869b719f37bb66937cb7bd327afaf1 (diff)
downloadlibdom-21154af546747dd02ea8d6f0ee5332ba5fcd3acb.tar.gz
libdom-21154af546747dd02ea8d6f0ee5332ba5fcd3acb.tar.bz2
Keep the context for the libdom binding for the subparser to usechris/fetch-x-ent-ref
-rw-r--r--bindings/xml/expat_xmlparser.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/bindings/xml/expat_xmlparser.c b/bindings/xml/expat_xmlparser.c
index e8ae21a..ae7780d 100644
--- a/bindings/xml/expat_xmlparser.c
+++ b/bindings/xml/expat_xmlparser.c
@@ -36,17 +36,21 @@ struct dom_xml_parser {
static int expat_xmlparser_parse_cb(void *parser, const char *data, int size, const char *uri)
{
enum XML_Status status;
+ struct dom_xml_parser *xml_parser;
XML_SetBase(parser, uri);
+ xml_parser = XML_GetUserData(parser);
status = XML_Parse(parser, data, size, 0);
if (status != XML_STATUS_OK) {
XML_ParserFree(parser);
+ free(xml_parser);
return XML_STATUS_OK;
}
XML_Parse(parser, "", 0, 1);
XML_ParserFree(parser);
+ free(xml_parser);
return XML_STATUS_OK;
}
@@ -314,6 +318,7 @@ expat_xmlparser_external_entity_ref_handler(XML_Parser parser,
const XML_Char *public_id)
{
XML_Parser subparser;
+ struct dom_xml_parser *xml_parser_copy;
UNUSED(public_id);
@@ -326,14 +331,21 @@ expat_xmlparser_external_entity_ref_handler(XML_Parser parser,
return XML_STATUS_OK;
}
- /**\todo do we need to push a copy of xml_parser into our parser userdata here? */
+ xml_parser_copy = malloc(sizeof(struct dom_xml_parser));
+ if (xml_parser_copy == NULL) {
+ return XML_STATUS_OK;
+ }
subparser = XML_ExternalEntityParserCreate(parser, context, NULL);
if (subparser == NULL) {
return XML_STATUS_OK;
}
-
+
+ memcpy(xml_parser_copy, xml_parser, sizeof(struct dom_xml_parser));
+ XML_SetUserData(subparser, xml_parser_copy);
+ xml_parser_copy->parser = subparser;
+
if(xml_parser->fetch_cb(subparser, base, system_id, expat_xmlparser_parse_cb) == false)
return XML_STATUS_OK;