aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-08-03 09:41:21 +0200
committerMihai Moldovan <ionic@ionic.de>2017-08-03 09:41:21 +0200
commit6ae091cc27f90bd431e4d9564c760fa209f8efb8 (patch)
tree253588fb5860a00d39e957085a08a0dfcd736927 /debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch
parenta4fb30f8d0dc188821ac61d64d113a6ae6156b95 (diff)
downloadnx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.gz
nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.bz2
nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.zip
debian/patches: refresh all patches.
Removes some fuzziness and adds the -p diff option to show the C function name in hunk headers.
Diffstat (limited to 'debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch')
-rw-r--r--debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch11
1 files changed, 3 insertions, 8 deletions
diff --git a/debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch b/debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch
index 2b2fa76c8..c0fa2cdae 100644
--- a/debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch
+++ b/debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch
@@ -19,11 +19,9 @@ v2: use xfree() instead of free() for nx-libs 3.6.x (Mihai Moldovan)
nx-X11/lib/font/fc/fserve.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
-diff --git a/nx-X11/lib/font/fc/fserve.c b/nx-X11/lib/font/fc/fserve.c
-index 0d792c7..86b5753 100644
--- a/nx-X11/lib/font/fc/fserve.c
+++ b/nx-X11/lib/font/fc/fserve.c
-@@ -2985,7 +2985,7 @@ _fs_recv_conn_setup (FSFpePtr conn)
+@@ -2782,7 +2782,7 @@ _fs_recv_conn_setup (FSFpePtr conn)
int ret;
fsConnSetup *setup;
FSFpeAltPtr alts;
@@ -32,7 +30,7 @@ index 0d792c7..86b5753 100644
int setup_len;
char *alt_save, *alt_names;
-@@ -3012,9 +3012,9 @@ _fs_recv_conn_setup (FSFpePtr conn)
+@@ -2809,9 +2809,9 @@ _fs_recv_conn_setup (FSFpePtr conn)
}
if (setup->num_alternates)
{
@@ -44,7 +42,7 @@ index 0d792c7..86b5753 100644
if (alts)
{
alt_names = (char *) (setup + 1);
-@@ -3023,10 +3023,25 @@ _fs_recv_conn_setup (FSFpePtr conn)
+@@ -2820,10 +2820,25 @@ _fs_recv_conn_setup (FSFpePtr conn)
{
alts[i].subset = alt_names[0];
alt_len = alt_names[1];
@@ -70,6 +68,3 @@ index 0d792c7..86b5753 100644
alt_names += _fs_pad_length (alt_len + 2);
}
conn->numAlts = setup->num_alternates;
---
-2.1.4
-