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.
38 lines
1.2 KiB
38 lines
1.2 KiB
From c171a25d614097e53ab84f64639de4dfbc197613 Mon Sep 17 00:00:00 2001 |
|
From: Daniel Veillard <veillard@redhat.com> |
|
Date: Mon, 29 Jun 2015 16:10:26 +0800 |
|
Subject: [PATCH] Fail parsing early on if encoding conversion failed |
|
To: libvir-list@redhat.com |
|
|
|
For https://bugzilla.gnome.org/show_bug.cgi?id=751631 |
|
|
|
If we fail conversing the current input stream while |
|
processing the encoding declaration of the XMLDecl |
|
then it's safer to just abort there and not try to |
|
report further errors. |
|
|
|
Signed-off-by: Daniel Veillard <veillard@redhat.com> |
|
--- |
|
parser.c | 6 +++++- |
|
1 file changed, 5 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/parser.c b/parser.c |
|
index dc14e5c..e2e0ad8 100644 |
|
--- a/parser.c |
|
+++ b/parser.c |
|
@@ -10415,7 +10415,11 @@ xmlParseEncodingDecl(xmlParserCtxtPtr ctxt) { |
|
|
|
handler = xmlFindCharEncodingHandler((const char *) encoding); |
|
if (handler != NULL) { |
|
- xmlSwitchToEncoding(ctxt, handler); |
|
+ if (xmlSwitchToEncoding(ctxt, handler) < 0) { |
|
+ /* failed to convert */ |
|
+ ctxt->errNo = XML_ERR_UNSUPPORTED_ENCODING; |
|
+ return(NULL); |
|
+ } |
|
} else { |
|
xmlFatalErrMsgStr(ctxt, XML_ERR_UNSUPPORTED_ENCODING, |
|
"Unsupported encoding %s\n", encoding); |
|
-- |
|
2.5.0 |
|
|
|
|