[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6173/8267] cairo: Fix CVE-2017-7475

[Emmanuele Bassi <ebassi src gnome org>]

commit 8c19ed047a3333c5dd38b0d459ea81bb218950af
Author: Fan Xin <fan xin jp fujitsu com>
Date:   Tue Jun 6 15:57:52 2017 +0900

    cairo: Fix CVE-2017-7475
    
    CVE: CVE-2017-7475
    
    Bug 100763 - Denial-of-Service Attack due to Logical Problem in Program
    
    https://bugs.freedesktop.org/show_bug.cgi?id=100763
    
    (From OE-Core rev: 03be750d9c5a090141a9d76f8ee30d5f696a8595)
    
    Signed-off-by: Fan Xin <fan xin jp fujitsu com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...et_bitmap_surface-bsc1036789-CVE-2017-7475.diff |   22 ++++++++++++++++++++
 meta/recipes-graphics/cairo/cairo_1.14.8.bb        |    4 ++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff 
b/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
new file mode 100644
index 0000000..7aaad2e
--- /dev/null
+++ b/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
@@ -0,0 +1,22 @@
+Cairo: Fix Denial-of-Service Attack due to Logical Problem in Program
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100763
+
+CVE: CVE-2017-7475
+Upstream-Status: Submitted
+
+Signed-off-by: Fan Xin <fan xin jp fujitsu com>
+
+Index: cairo-1.15.4/src/cairo-ft-font.c
+===================================================================
+--- cairo-1.15.4.orig/src/cairo-ft-font.c
++++ cairo-1.15.4/src/cairo-ft-font.c
+@@ -1149,7 +1149,7 @@ _get_bitmap_surface (FT_Bitmap                *bi
+     width = bitmap->width;
+     height = bitmap->rows;
+ 
+-    if (width == 0 || height == 0) {
++    if (width == 0 || height == 0 || bitmap->buffer == NULL) {
+       *surface = (cairo_image_surface_t *)
+           cairo_image_surface_create_for_data (NULL, format, 0, 0, 0);
+       return (*surface)->base.status;
diff --git a/meta/recipes-graphics/cairo/cairo_1.14.8.bb b/meta/recipes-graphics/cairo/cairo_1.14.8.bb
index 5a3c74f..af6be56 100644
--- a/meta/recipes-graphics/cairo/cairo_1.14.8.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.14.8.bb
@@ -2,7 +2,9 @@ require cairo.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz";
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
+           file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ 
+          "
 
 SRC_URI[md5sum] = "4ef0db2eacb271c74f8a3fd87822aa98"
 SRC_URI[sha256sum] = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20"