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. --- ...210-unvalidated-lengths-when-reading-.full.patch | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'debian/patches/1009-CVE-2014-0210-unvalidated-lengths-when-reading-.full.patch') diff --git a/debian/patches/1009-CVE-2014-0210-unvalidated-lengths-when-reading-.full.patch b/debian/patches/1009-CVE-2014-0210-unvalidated-lengths-when-reading-.full.patch index 6b06b8663..eded3517a 100644 --- a/debian/patches/1009-CVE-2014-0210-unvalidated-lengths-when-reading-.full.patch +++ b/debian/patches/1009-CVE-2014-0210-unvalidated-lengths-when-reading-.full.patch @@ -12,11 +12,9 @@ that the reply was at least as long as the struct being cast to. nx-X11/lib/font/fc/fserve.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) -diff --git a/nx-X11/lib/font/fc/fserve.c b/nx-X11/lib/font/fc/fserve.c -index c159b2b..ca10aa4 100644 --- a/nx-X11/lib/font/fc/fserve.c +++ b/nx-X11/lib/font/fc/fserve.c -@@ -94,6 +94,12 @@ in this Software without prior written authorization from The Open Group. +@@ -94,6 +94,12 @@ in this Software without prior written a (pci)->descent || \ (pci)->characterWidth) @@ -29,7 +27,7 @@ index c159b2b..ca10aa4 100644 extern void ErrorF(const char *f, ...); static int fs_read_glyphs ( FontPathElementPtr fpe, FSBlockDataPtr blockrec ); -@@ -209,9 +215,22 @@ _fs_add_rep_log (FSFpePtr conn, fsGenericReply *rep) +@@ -209,9 +215,22 @@ _fs_add_rep_log (FSFpePtr conn, fsGeneri rep->sequenceNumber, conn->reqbuffer[i].opcode); } @@ -52,7 +50,7 @@ index c159b2b..ca10aa4 100644 #endif static Bool -@@ -693,13 +712,15 @@ fs_read_open_font(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -693,13 +712,15 @@ fs_read_open_font(FontPathElementPtr fpe int ret; rep = (fsOpenBitmapFontReply *) fs_get_reply (conn, &ret); @@ -69,7 +67,7 @@ index c159b2b..ca10aa4 100644 return BadFontName; } -@@ -835,13 +856,15 @@ fs_read_query_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -835,13 +856,15 @@ fs_read_query_info(FontPathElementPtr fp int ret; rep = (fsQueryXInfoReply *) fs_get_reply (conn, &ret); @@ -86,7 +84,7 @@ index c159b2b..ca10aa4 100644 return BadFontName; } -@@ -962,13 +985,15 @@ fs_read_extent_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -962,13 +985,15 @@ fs_read_extent_info(FontPathElementPtr f FontInfoRec *fi = &bfont->pfont->info; rep = (fsQueryXExtents16Reply *) fs_get_reply (conn, &ret); @@ -103,7 +101,7 @@ index c159b2b..ca10aa4 100644 return BadFontName; } -@@ -1833,13 +1858,15 @@ fs_read_glyphs(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -1833,13 +1858,15 @@ fs_read_glyphs(FontPathElementPtr fpe, F unsigned long minchar, maxchar; rep = (fsQueryXBitmaps16Reply *) fs_get_reply (conn, &ret); @@ -120,7 +118,7 @@ index c159b2b..ca10aa4 100644 goto bail; } -@@ -2243,12 +2270,14 @@ fs_read_list(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -2243,12 +2270,14 @@ fs_read_list(FontPathElementPtr fpe, FSB int err; rep = (fsListFontsReply *) fs_get_reply (conn, &ret); @@ -136,7 +134,7 @@ index c159b2b..ca10aa4 100644 return AllocError; } data = (char *) rep + SIZEOF (fsListFontsReply); -@@ -2366,12 +2395,15 @@ fs_read_list_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -2366,12 +2395,15 @@ fs_read_list_info(FontPathElementPtr fpe _fs_free_props (&binfo->info); rep = (fsListFontsWithXInfoReply *) fs_get_reply (conn, &ret); @@ -153,6 +151,3 @@ index c159b2b..ca10aa4 100644 goto done; } /* --- -2.1.4 - -- cgit v1.2.3