Skip to content

Commit 09f8bb7

Browse files
nwellnhofdahlstrom-g
authored andcommitted
[CVE-2024-25062] xmlreader: Don't expand XIncludes when backtracking
Fixes a use-after-free if XML Reader if used with DTD validation and XInclude expansion. Fixes youtube#604. (cherry picked from commit 92721970884fcc13305cb8e23cdc5f0dd7667c2c)
1 parent 0991953 commit 09f8bb7

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

‎third_party/libxml/src/xmlreader.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,6 +1446,7 @@ xmlTextReaderRead(xmlTextReaderPtr reader) {
14461446
* Handle XInclude if asked for
14471447
*/
14481448
if ((reader->xinclude) && (reader->in_xinclude == 0) &&
1449+
(reader->state != XML_TEXTREADER_BACKTRACK) &&
14491450
(reader->node != NULL) &&
14501451
(reader->node->type == XML_ELEMENT_NODE) &&
14511452
(reader->node->ns != NULL) &&

0 commit comments

Comments
 (0)