From 77606ed0b26aa364dd53b1b9689ff3fd8f0489f3 Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Wed, 22 Aug 2018 16:03:52 +0200
Subject: xml: improve handling of invalid long data entities

this also fixes an issue with truncating and missing data on invalid input.
---
 xml.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/xml.c b/xml.c
index 6b58bd4..c4573b4 100644
--- a/xml.c
+++ b/xml.c
@@ -416,9 +416,16 @@ xml_parse(XMLParser *x)
 							break;
 						if (datalen < sizeof(x->data) - 1)
 							x->data[datalen++] = c;
-						if (isspace(c))
+						else {
+							/* entity too long for buffer, handle as normal data */
+							x->data[datalen] = '\0';
+							if (x->xmldata)
+								x->xmldata(x, x->data, datalen);
+							x->data[0] = c;
+							datalen = 1;
 							break;
-						else if (c == ';') {
+						}
+						if (c == ';') {
 							x->data[datalen] = '\0';
 							if (x->xmldataentity)
 								x->xmldataentity(x, x->data, datalen);
-- 
cgit v1.2.3