1 From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001
2 From: Nick Wellnhofer <wellnhofer@aevum.de>
3 Date: Fri, 7 Aug 2020 21:54:27 +0200
4 Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout'
6 Make sure that truncated UTF-8 sequences don't cause an out-of-bounds
9 Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for
15 1 file changed, 6 insertions(+)
19 @@ -528,6 +528,12 @@ static void
20 xmlHTMLEncodeSend(void) {
24 + * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might
25 + * end with a truncated UTF-8 sequence. This is a hack to at least avoid
26 + * an out-of-bounds read.
28 + memset(&buffer[sizeof(buffer)-4], 0, 4);
29 result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer);
31 xmlGenericError(xmlGenericErrorContext, "%s", result);