diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-11-28 17:58:21 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-11-29 12:53:08 +0100 |
| commit | 1ec0b7407f27a12adc6978d98832c41226465101 (patch) | |
| tree | b8de725e599310db714da9ff3c7ef525a255dacc /gnu/packages/patches/libxfont-CVE-2017-13720.patch | |
| parent | 4fc61dac3ce201c72b312a6cfed5b3d4b96850f7 (diff) | |
gnu: libxfont@2: Update replacement to 2.0.3 [fixes CVE-2017-16611].
* gnu/packages/xorg.scm (libxfont2/fixed): Rename to ...
(libxfont2-2.0.3): ... this. Make public.
[version]: New field.
[source]: Add URI and SHA256. Remove patches.
(libxfont2)[replacement]: Change LIBXFONT2/FIXED to LIBXFONT2-2.0.3.
* gnu/packages/patches/libxfont-CVE-2017-13720.patch,
gnu/packages/patches/libxfont-CVE-2017-13722.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/patches/libxfont-CVE-2017-13720.patch')
| -rw-r--r-- | gnu/packages/patches/libxfont-CVE-2017-13720.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/gnu/packages/patches/libxfont-CVE-2017-13720.patch b/gnu/packages/patches/libxfont-CVE-2017-13720.patch deleted file mode 100644 index 0936171060..0000000000 --- a/gnu/packages/patches/libxfont-CVE-2017-13720.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix CVE-2017-13720. - -Copied from upstream source repository: -<https://cgit.freedesktop.org/xorg/lib/libXfont/commit/?id=d1e670a4a8704b8708e493ab6155589bcd570608> - - -From d1e670a4a8704b8708e493ab6155589bcd570608 Mon Sep 17 00:00:00 2001 -From: Michal Srb <msrb@suse.com> -Date: Thu, 20 Jul 2017 13:38:53 +0200 -Subject: Check for end of string in PatternMatch (CVE-2017-13720) - -If a pattern contains '?' character, any character in the string is skipped, -even if it is '\0'. The rest of the matching then reads invalid memory. - -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Julien Cristau <jcristau@debian.org> - -diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c -index 4ce2473..996b7d1 100644 ---- a/src/fontfile/fontdir.c -+++ b/src/fontfile/fontdir.c -@@ -400,8 +400,10 @@ PatternMatch(char *pat, int patdashes, char *string, int stringdashes) - } - } - case '?': -- if (*string++ == XK_minus) -+ if ((t = *string++) == XK_minus) - stringdashes--; -+ if (!t) -+ return 0; - break; - case '\0': - return (*string == '\0'); --- -cgit v0.10.2 - |