diff options
author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2017-10-14 13:37:25 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-10-15 15:54:44 +0200 |
commit | eb8222ab0bd47387d14d44bbd809988fef8b69f4 (patch) | |
tree | 260ae6d6a7d10294e122f1a2343c6fc7b7dd7036 /package/x11r7/xlib_libXfont2/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch | |
parent | 7bc38e794bc4591d33b206dbc2c6229d2f93e14e (diff) | |
download | buildroot-eb8222ab0bd47387d14d44bbd809988fef8b69f4.tar.gz buildroot-eb8222ab0bd47387d14d44bbd809988fef8b69f4.zip |
package/x11r7/xlib_libXfont2: bump version to 2.0.2
Removed patches applied upstream, added all upstream hashes.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/x11r7/xlib_libXfont2/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch')
-rw-r--r-- | package/x11r7/xlib_libXfont2/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/package/x11r7/xlib_libXfont2/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch b/package/x11r7/xlib_libXfont2/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch deleted file mode 100644 index 3795179af1..0000000000 --- a/package/x11r7/xlib_libXfont2/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch +++ /dev/null @@ -1,34 +0,0 @@ -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: [PATCH] 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> -Signed-off-by: Peter Korsgaard <peter@korsgaard.com> ---- - src/fontfile/fontdir.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -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'); --- -2.11.0 - |