Blame SOURCES/libxml2-2.9.7-CVE-2020-24977.patch
|
 |
dc191c |
From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001
|
|
|
dc191c |
From: Nick Wellnhofer <wellnhofer@aevum.de>
|
|
|
dc191c |
Date: Fri, 7 Aug 2020 21:54:27 +0200
|
|
|
dc191c |
Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout'
|
|
|
dc191c |
|
|
|
dc191c |
Make sure that truncated UTF-8 sequences don't cause an out-of-bounds
|
|
|
dc191c |
array access.
|
|
|
dc191c |
|
|
|
dc191c |
Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for
|
|
|
dc191c |
the report.
|
|
|
dc191c |
|
|
|
dc191c |
Fixes #178.
|
|
|
dc191c |
---
|
|
|
dc191c |
xmllint.c | 6 ++++++
|
|
|
dc191c |
1 file changed, 6 insertions(+)
|
|
|
dc191c |
|
|
|
dc191c |
diff --git a/xmllint.c b/xmllint.c
|
|
|
dc191c |
index f6a8e4636..c647486f3 100644
|
|
|
dc191c |
--- a/xmllint.c
|
|
|
dc191c |
+++ b/xmllint.c
|
|
|
dc191c |
@@ -528,6 +528,12 @@ static void
|
|
|
dc191c |
xmlHTMLEncodeSend(void) {
|
|
|
dc191c |
char *result;
|
|
|
dc191c |
|
|
|
dc191c |
+ /*
|
|
|
dc191c |
+ * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might
|
|
|
dc191c |
+ * end with a truncated UTF-8 sequence. This is a hack to at least avoid
|
|
|
dc191c |
+ * an out-of-bounds read.
|
|
|
dc191c |
+ */
|
|
|
dc191c |
+ memset(&buffer[sizeof(buffer)-4], 0, 4);
|
|
|
dc191c |
result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer);
|
|
|
dc191c |
if (result) {
|
|
|
dc191c |
xmlGenericError(xmlGenericErrorContext, "%s", result);
|
|
|
dc191c |
--
|
|
|
dc191c |
GitLab
|
|
|
dc191c |
|