aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch')
-rw-r--r--debian/patches/1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch11
1 files changed, 3 insertions, 8 deletions
diff --git a/debian/patches/1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch b/debian/patches/1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch
index 93e7d32da..1599e0245 100644
--- a/debian/patches/1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch
+++ b/debian/patches/1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch
@@ -13,11 +13,9 @@ bitmaps in the reply.
nx-X11/lib/font/fc/fserve.c | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
-diff --git a/nx-X11/lib/font/fc/fserve.c b/nx-X11/lib/font/fc/fserve.c
-index 79de4f3..26218e5 100644
--- a/nx-X11/lib/font/fc/fserve.c
+++ b/nx-X11/lib/font/fc/fserve.c
-@@ -1916,6 +1916,7 @@ fs_read_glyphs(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
+@@ -1917,6 +1917,7 @@ fs_read_glyphs(FontPathElementPtr fpe, F
FontInfoPtr pfi = &pfont->info;
fsQueryXBitmaps16Reply *rep;
char *buf;
@@ -25,7 +23,7 @@ index 79de4f3..26218e5 100644
fsOffset32 *ppbits;
fsOffset32 local_off;
char *off_adr;
-@@ -1947,9 +1948,33 @@ fs_read_glyphs(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
+@@ -1948,9 +1949,33 @@ fs_read_glyphs(FontPathElementPtr fpe, F
buf = (char *) rep;
buf += SIZEOF (fsQueryXBitmaps16Reply);
@@ -59,7 +57,7 @@ index 79de4f3..26218e5 100644
pbitmaps = (pointer ) buf;
if (blockrec->type == FS_LOAD_GLYPHS)
-@@ -2007,7 +2032,9 @@ fs_read_glyphs(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
+@@ -2008,7 +2033,9 @@ fs_read_glyphs(FontPathElementPtr fpe, F
*/
if (NONZEROMETRICS(&fsdata->encoding[minchar].metrics))
{
@@ -70,6 +68,3 @@ index 79de4f3..26218e5 100644
{
bits = allbits;
allbits += local_off.length;
---
-2.1.4
-