From: JinWang An <jinwang.an@samsung.com>
Date: Tue, 20 Jun 2023 07:57:03 +0000 (+0900)
Subject: [CVE-2020-7595] Fix infinite loop in xmlStringLenDecodeEntities
X-Git-Tag: accepted/tizen/6.0/base/tool/20230625.221418
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2F6.0%2Fbase%2Ftool%2F20230625.221418;p=platform%2Fupstream%2Flibxml2.git

[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 <xiezhipeng1@huawei.com>
Date: Thu, 12 Dec 2019 17:30:55 +0800

Change-Id: Icf48083013a7e949a591eac94dc6def067a49459
Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
Signed-off-by: JinWang An <jinwang.an@samsung.com>
---

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] == '#')) {