1*b1cdbd2cSJim JagielskiFrom 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001
2*b1cdbd2cSJim JagielskiFrom: Zhipeng Xie <xiezhipeng1@huawei.com>
3*b1cdbd2cSJim JagielskiDate: Thu, 12 Dec 2019 17:30:55 +0800
4*b1cdbd2cSJim JagielskiSubject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities
5*b1cdbd2cSJim Jagielski
6*b1cdbd2cSJim JagielskiWhen ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef
7*b1cdbd2cSJim Jagielskireturn NULL which cause a infinite loop in xmlStringLenDecodeEntities
8*b1cdbd2cSJim Jagielski
9*b1cdbd2cSJim JagielskiFound with libFuzzer.
10*b1cdbd2cSJim Jagielski
11*b1cdbd2cSJim JagielskiSigned-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
12*b1cdbd2cSJim Jagielski---
13*b1cdbd2cSJim Jagielski parser.c | 3 ++-
14*b1cdbd2cSJim Jagielski 1 file changed, 2 insertions(+), 1 deletion(-)
15*b1cdbd2cSJim Jagielski
16*b1cdbd2cSJim Jagielskidiff --git misc/libxml2-2.9.10/parser.c misc/build/libxml2-2.9.10/parser.c
17*b1cdbd2cSJim Jagielskiindex d1c319631..a34bb6cdd 100644
18*b1cdbd2cSJim Jagielski--- misc/libxml2-2.9.10/parser.c
19*b1cdbd2cSJim Jagielski+++ misc/build/libxml2-2.9.10/parser.c
20*b1cdbd2cSJim Jagielski@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
21*b1cdbd2cSJim Jagielski     else
22*b1cdbd2cSJim Jagielski         c = 0;
23*b1cdbd2cSJim Jagielski     while ((c != 0) && (c != end) && /* non input consuming loop */
24*b1cdbd2cSJim Jagielski-	   (c != end2) && (c != end3)) {
25*b1cdbd2cSJim Jagielski+           (c != end2) && (c != end3) &&
26*b1cdbd2cSJim Jagielski+           (ctxt->instate != XML_PARSER_EOF)) {
27*b1cdbd2cSJim Jagielski
28*b1cdbd2cSJim Jagielski 	if (c == 0) break;
29*b1cdbd2cSJim Jagielski         if ((c == '&') && (str[1] == '#')) {
30*b1cdbd2cSJim Jagielski--
31*b1cdbd2cSJim JagielskiGitLab
32*b1cdbd2cSJim Jagielski
33