libxfont: upgrade to 1.5.1

Remove the backported patches as they're integrated in this release.

(From OE-Core rev: 425096a81afcf1f60dad8e74e10b2fe36d72a854)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 0 insertions, 38 deletions

diff --git a/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch b/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch
deleted file mode 100644
index 0779c26dcd..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2deda9906480f9c8ae07b8c2a5510cc7e4c59a8e Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri, 6 Feb 2015 15:50:45 -0800
-Subject: [PATCH] bdfReadProperties: property count needs range check
- [CVE-2015-1802]
-
-Avoid integer overflow or underflow when allocating memory arrays
-by multiplying the number of properties reported for a BDF font.
-
-Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
-
-Upstream-Status: backport
-
-Signed-off-by: Li Zhou <li.zhou@windriver.com>
----
- src/bitmap/bdfread.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
-index 914a024..6387908 100644
---- a/src/bitmap/bdfread.c
-+++ b/src/bitmap/bdfread.c
-@@ -604,7 +604,9 @@ bdfReadProperties(FontFilePtr file, FontPtr pFont, bdfFileState *pState)
-        bdfError("missing 'STARTPROPERTIES'\n");
-        return (FALSE);
-     }
--    if (sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) {
-+    if ((sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) ||
-+       (nProps <= 0) ||
-+       (nProps > ((INT32_MAX / sizeof(FontPropRec)) - BDF_GENPROPS))) {
-        bdfError("bad 'STARTPROPERTIES'\n");
-        return (FALSE);
-     }
--- 
-1.7.9.5
-