From 64b97c05d73b983d9afa3759dce8232629be05c3 Mon Sep 17 00:00:00 2001 From: JinWang An Date: Tue, 20 Jun 2023 16:57:03 +0900 Subject: [PATCH] [CVE-2020-7595] Fix infinite loop in xmlStringLenDecodeEntities When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef return NULL which cause a infinite loop in xmlStringLenDecodeEntities Found with libFuzzer. From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 From: Zhipeng Xie Date: Thu, 12 Dec 2019 17:30:55 +0800 Change-Id: Icf48083013a7e949a591eac94dc6def067a49459 Signed-off-by: Zhipeng Xie Signed-off-by: JinWang An --- parser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/parser.c b/parser.c index cbfd440..cc40c8b 100644 --- a/parser.c +++ b/parser.c @@ -2647,7 +2647,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, else c = 0; while ((c != 0) && (c != end) && /* non input consuming loop */ - (c != end2) && (c != end3)) { + (c != end2) && (c != end3) && + (ctxt->instate != XML_PARSER_EOF)) { if (c == 0) break; if ((c == '&') && (str[1] == '#')) { -- 2.7.4