Skip to content
Snippets Groups Projects
Commit 95837045 authored by Hossein Pursultani's avatar Hossein Pursultani Committed by GitLab Release Tools Bot
Browse files

Update libxml2 to version 2.9.10

parent a73fe0c3
No related branches found
No related tags found
No related merge requests found
---
title: Update libxml2 to version 2.9.10
merge_request:
author:
type: security
From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Fri, 7 Aug 2020 21:54:27 +0200
Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout'
Make sure that truncated UTF-8 sequences don't cause an out-of-bounds
array access.
Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for
the report.
Fixes #178.
---
xmllint.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/xmllint.c b/xmllint.c
index f6a8e4636..c647486f3 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -528,6 +528,12 @@ static void
xmlHTMLEncodeSend(void) {
char *result;
+ /*
+ * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might
+ * end with a truncated UTF-8 sequence. This is a hack to at least avoid
+ * an out-of-bounds read.
+ */
+ memset(&buffer[sizeof(buffer)-4], 0, 4);
result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer);
if (result) {
xmlGenericError(xmlGenericErrorContext, "%s", result);
--
GitLab
\ No newline at end of file
Loading
Loading
@@ -15,7 +15,7 @@
#
 
name 'libxml2'
default_version '2.9.9'
default_version '2.9.10'
 
license 'MIT'
license_file 'COPYING'
Loading
Loading
@@ -27,8 +27,8 @@ dependency 'libiconv'
dependency 'liblzma'
dependency 'config_guess'
 
version '2.9.9' do
source md5: 'c04a5a0a042eaa157e8e8c9eabe76bd6'
version '2.9.10' do
source sha256: 'aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f'
end
 
source url: "ftp://xmlsoft.org/libxml2/libxml2-#{version}.tar.gz"
Loading
Loading
@@ -38,6 +38,8 @@ relative_path "libxml2-#{version}"
build do
env = with_standard_compiler_flags(with_embedded_path)
 
patch source: '50f06b3efb638efb0abd95dc62dca05ae67882c2.patch', env: env
configure_command = [
"--with-zlib=#{install_dir}/embedded",
"--with-iconv=#{install_dir}/embedded",
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment