mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2024-10-27 04:55:04 +03:00
eddfbc38fa
Despite the comment, I can't see a reason why external entities must be loaded in the SAX handler. For external entities, the handler is typically first invoked via xmlParseReference which will later load the entity on its own if it wasn't loaded yet. The old code also lead to duplicated SAX events which makes it basically impossible to reuse xmlSAX2GetEntity for a custom SAX parser. See the change to the expected test output. Note that xmlSAX2GetEntity was loading the entity via xmlParseCtxtExternalEntity while xmlParseReference uses xmlParseExternalEntityPrivate. In the previous commit, the two functions were merged, trying to compensate for some slight differences between the two mostly identical implementations. But the more urgent reason for this change is that xmlParseReference has the facility to abort early when recursive entities are detected, avoiding what could practically amount to an infinite loop. If you want to backport this change, note that the previous three commits are required as well:f9ea1a24Fix copying of entities in xmlParseReference5c7e0a9aCopy some XMLReader option flags to parser context1a3e584aMerge code paths loading external entities Found by OSS-Fuzz.
31 lines
922 B
Plaintext
31 lines
922 B
Plaintext
SAX.setDocumentLocator()
|
|
SAX.startDocument()
|
|
SAX.internalSubset(EXAMPLE, , example.dtd)
|
|
SAX.entityDecl(xml, 1, (null), (null), Extensible Markup Language)
|
|
SAX.getEntity(xml)
|
|
SAX.entityDecl(title, 2, -//MY-TITLE//FR, title.xml, (null))
|
|
SAX.unparsedEntityDecl(image, (null), img.gif, GIF)
|
|
SAX.externalSubset(EXAMPLE, , example.dtd)
|
|
SAX.startElementNs(EXAMPLE, NULL, NULL, 0, 0, 0)
|
|
SAX.characters(
|
|
, 3)
|
|
SAX.getEntity(title)
|
|
SAX.ignorableWhitespace(
|
|
, 1)
|
|
SAX.startElementNs(title, NULL, NULL, 0, 0, 0)
|
|
SAX.characters(my title, 8)
|
|
SAX.endElementNs(title, NULL, NULL)
|
|
SAX.characters(
|
|
, 1)
|
|
SAX.characters(
|
|
This text is about XML, the, 31)
|
|
SAX.getEntity(xml)
|
|
SAX.characters(Extensible Markup Language, 26)
|
|
SAX.characters( and this is an embedded , 25)
|
|
SAX.startElementNs(IMG, NULL, NULL, 0, 1, 0, src='imag...', 5)
|
|
SAX.endElementNs(IMG, NULL, NULL)
|
|
SAX.characters(
|
|
, 1)
|
|
SAX.endElementNs(EXAMPLE, NULL, NULL)
|
|
SAX.endDocument()
|