mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
libcroco: Fix two CVEs
CVE: CVE-2017-8834 CVE-2017-8871 (From OE-Core rev: fe2d5b0d56201110323911d206243fdcc7f80115) Signed-off-by: Muminul Islam <muislam@microsoft.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
f3eae2a4f7
commit
2559517faf
@@ -0,0 +1,38 @@
|
||||
From 38bdf8e956218dd6a72942229cf39ef8e45dd28f Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gorse <mgorse@alum.wpi.edu>
|
||||
Date: Thu, 2 May 2019 10:54:43 -0500
|
||||
Subject: [PATCH] cr_utils_read_char_from_utf8_buf: move past invalid UTF-8
|
||||
Reply-To: muislam@microsoft.com; Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Otherwise, the offending character is never consumed, possibly leading
|
||||
to an infinite loop.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=782647
|
||||
|
||||
CVE: CVE-2017-8834 CVE-2017-8871
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Muminul Islam <muislam@microsoft.com>
|
||||
|
||||
Upstream commit: https://bug782647.bugzilla-attachments.gnome.org/attachment.cgi?id=374219
|
||||
---
|
||||
src/cr-utils.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/cr-utils.c b/src/cr-utils.c
|
||||
index 2420cec..6cf4849 100644
|
||||
--- a/src/cr-utils.c
|
||||
+++ b/src/cr-utils.c
|
||||
@@ -505,6 +505,7 @@ cr_utils_read_char_from_utf8_buf (const guchar * a_in,
|
||||
|
||||
} else {
|
||||
/*BAD ENCODING */
|
||||
+ nb_bytes_2_decode = 1;
|
||||
goto end;
|
||||
}
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -18,6 +18,7 @@ inherit gnomebase gtk-doc binconfig-disabled
|
||||
|
||||
SRC_URI += "file://CVE-2017-7960.patch \
|
||||
file://CVE-2017-7961.patch \
|
||||
file://CVE-2017-8834_71.patch \
|
||||
"
|
||||
|
||||
SRC_URI[archive.md5sum] = "bc0984fce078ba2ce29f9500c6b9ddce"
|
||||
|
||||
Reference in New Issue
Block a user