You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
1.0 KiB
39 lines
1.0 KiB
7 years ago
|
From eb1114e90b22e09d500840bac1e171763e8baa16 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hugh Davenport <hugh@allthethings.co.nz>
|
||
|
|
Date: Tue, 3 Nov 2015 20:40:49 +0800
|
||
|
|
Subject: [PATCH] Avoid extra processing of MarkupDecl when EOF
|
||
|
|
To: libvir-list@redhat.com
|
||
|
|
|
||
|
|
For https://bugzilla.gnome.org/show_bug.cgi?id=756263
|
||
|
|
|
||
|
|
One place where ctxt->instate == XML_PARSER_EOF whic was set up
|
||
|
|
by entity detection issues doesn't get noticed, and even overrided
|
||
|
|
|
||
|
|
Signed-off-by: Daniel Veillard <veillard@redhat.com>
|
||
|
|
---
|
||
|
|
parser.c | 8 ++++++++
|
||
|
|
1 file changed, 8 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/parser.c b/parser.c
|
||
|
|
index b56d94c..262db1e 100644
|
||
|
|
--- a/parser.c
|
||
|
|
+++ b/parser.c
|
||
|
|
@@ -6952,6 +6952,14 @@ xmlParseMarkupDecl(xmlParserCtxtPtr ctxt) {
|
||
|
|
xmlParsePI(ctxt);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ /*
|
||
|
|
+ * detect requirement to exit there and act accordingly
|
||
|
|
+ * and avoid having instate overriden later on
|
||
|
|
+ */
|
||
|
|
+ if (ctxt->instate == XML_PARSER_EOF)
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* This is only for internal subset. On external entities,
|
||
|
|
* the replacement is done before parsing stage
|
||
|
|
--
|
||
|
|
2.5.0
|
||
|
|
|