| From 41ac9049a27f52e7a1f3b341f8714149fc88d450 Mon Sep 17 00:00:00 2001 |
| From: Daniel Veillard <veillard@redhat.com> |
| Date: Tue, 27 Oct 2015 10:53:44 +0800 |
| Subject: [PATCH] Fix an error in previous Conditional section patch |
| |
| an off by one mistake in the change, led to error on correct |
| document where the end of the included entity was exactly |
| the end of the conditional section, leading to regtest failure |
| |
| Upstream-Status: Backport |
| |
| CVE-2015-7942-2 |
| |
| Signed-off-by: Armin Kuster <akuster@mvista.com> |
| |
| --- |
| parser.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/parser.c b/parser.c |
| index b9217ff..d67b300 100644 |
| --- a/parser.c |
| +++ b/parser.c |
| @@ -6916,7 +6916,7 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) { |
| NULL, NULL); |
| } |
| if ((ctxt-> instate != XML_PARSER_EOF) && |
| - ((ctxt->input->cur + 3) < ctxt->input->end)) |
| + ((ctxt->input->cur + 3) <= ctxt->input->end)) |
| SKIP(3); |
| } |
| } |
| -- |
| 2.3.5 |
| |