libcroco: update to 0.6.13
PATCH 1/1 libcroco: update to 0.6.13
Removed patches were upstreamed.
Signed-off-by Oleksandr Kravchuk <[email protected]>
---
.../libcroco/libcroco/CVE-2017-7960.patch | 56 -------------------
.../libcroco/libcroco/CVE-2017-7961.patch | 45 ---------------
...{libcroco_0.6.12.bb => libcroco_0.6.13.bb} | 8 +--
3 files changed, 2 insertions(+), 107 deletions(-)
delete mode 100644 meta/recipes-support/libcroco/libcroco/CVE-2017-7960.patch
delete mode 100644 meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch
rename meta/recipes-support/libcroco/{libcroco_0.6.12.bb => libcroco_0.6.13.bb} (72%)meta/recipes-support/libcroco/libcroco/CVE-2017-7960.patch deleted +0 -56
@@ -1,56 +0,0 @@ -input: check end of input before reading a byte - -When reading bytes we weren't check that the index wasn't -out of bound and this could produce an invalid read which -could deal to a security bug. - -Upstream-Status: Backport[https://gitlab.gnome.org/GNOME/libcroco/ - commit/898e3a8c8c0314d2e6b106809a8e3e93cf9d4394] - -CVE: CVE-2017-7960 - -Signed-off-by: Changqing Li <[email protected]> - -diff --git a/src/cr-input.c b/src/cr-input.c -index 49000b1f5f07fe057135f1b8fc69bdcf9613e300..3b63a88ee3b1c56778e58172d147d958951bf099 100644 ---- a/src/cr-input.c -+++ b/src/cr-input.c -@@ -256,7 +256,7 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc) - *we should free buf here because it's own by CRInput. - *(see the last parameter of cr_input_new_from_buf(). - */ -- buf = NULL ; -+ buf = NULL; - } - - cleanup: -@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this) - enum CRStatus - cr_input_read_byte (CRInput * a_this, guchar * a_byte) - { -+ gulong nb_bytes_left = 0; -+ - g_return_val_if_fail (a_this && PRIVATE (a_this) - && a_byte, CR_BAD_PARAM_ERROR); - -@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte) - if (PRIVATE (a_this)->end_of_input == TRUE) - return CR_END_OF_INPUT_ERROR; - -+ nb_bytes_left = cr_input_get_nb_bytes_left (a_this); -+ -+ if (nb_bytes_left < 1) { -+ return CR_END_OF_INPUT_ERROR; -+ } -+ - *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index]; - - if (PRIVATE (a_this)->nb_bytes - -@@ -477,7 +485,6 @@ cr_input_read_char (CRInput * a_this, guint32 * a_char) - if (*a_char == '\n') { - PRIVATE (a_this)->end_of_line = TRUE; - } -- - } - - return status;
meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch deleted +0 -45
45 lines not on this page · raw message
meta/recipes-support/libcroco/libcroco_0.6.13.bb renamed from meta/recipes-support/libcroco/libcroco_0.6.12.bb +2 -6
@@ -16,9 +16,5 @@ BINCONFIG = "${bindir}/croco-0.6-config" inherit gnomebase gtk-doc binconfig-disabled -SRC_URI += "file://CVE-2017-7960.patch \ - file://CVE-2017-7961.patch \ - " - -SRC_URI[archive.md5sum] = "bc0984fce078ba2ce29f9500c6b9ddce" -SRC_URI[archive.sha256sum] = "ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860" +SRC_URI[archive.md5sum] = "c80c5a8385011a0260dce6bd0da93dce" +SRC_URI[archive.sha256sum] = "767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4"
Signature · 1 line
2.17.1