From 6ae091cc27f90bd431e4d9564c760fa209f8efb8 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Thu, 3 Aug 2017 09:41:21 +0200 Subject: debian/patches: refresh all patches. Removes some fuzziness and adds the -p diff option to show the C function name in hunk headers. --- ...CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'debian/patches/1017-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch') diff --git a/debian/patches/1017-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch b/debian/patches/1017-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch index d92c4eece..7ad02bffd 100644 --- a/debian/patches/1017-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch +++ b/debian/patches/1017-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch @@ -13,11 +13,9 @@ bound reads when looping over these items in the reply. nx-X11/lib/font/fc/fserve.c | 56 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) -diff --git a/nx-X11/lib/font/fc/fserve.c b/nx-X11/lib/font/fc/fserve.c -index 60d9017..6ba3ad4 100644 --- a/nx-X11/lib/font/fc/fserve.c +++ b/nx-X11/lib/font/fc/fserve.c -@@ -2500,6 +2500,7 @@ fs_read_list_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -2501,6 +2501,7 @@ fs_read_list_info(FontPathElementPtr fpe FSBlockedListInfoPtr binfo = (FSBlockedListInfoPtr) blockrec->data; fsListFontsWithXInfoReply *rep; char *buf; @@ -25,7 +23,7 @@ index 60d9017..6ba3ad4 100644 FSFpePtr conn = (FSFpePtr) fpe->private; fsPropInfo *pi; fsPropOffset *po; -@@ -2536,7 +2537,8 @@ fs_read_list_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -2537,7 +2538,8 @@ fs_read_list_info(FontPathElementPtr fpe } buf = (char *) rep + SIZEOF (fsListFontsWithXInfoReply); @@ -35,7 +33,7 @@ index 60d9017..6ba3ad4 100644 /* * The original FS implementation didn't match * the spec, version 1 was respecified to match the FS. -@@ -2544,19 +2546,71 @@ fs_read_list_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -2545,19 +2547,71 @@ fs_read_list_info(FontPathElementPtr fpe */ if (conn->fsMajorVersion <= 1) { @@ -107,6 +105,3 @@ index 60d9017..6ba3ad4 100644 } #ifdef DEBUG --- -2.1.4 - -- cgit v1.2.3