diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-08-03 09:41:21 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-08-03 09:41:21 +0200 |
| commit | 6ae091cc27f90bd431e4d9564c760fa209f8efb8 (patch) | |
| tree | 253588fb5860a00d39e957085a08a0dfcd736927 /debian/patches/1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch | |
| parent | a4fb30f8d0dc188821ac61d64d113a6ae6156b95 (diff) | |
| download | nx-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/1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch')
| -rw-r--r-- | debian/patches/1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/debian/patches/1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch b/debian/patches/1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch index 9d0f3f875..9a75a01c8 100644 --- a/debian/patches/1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch +++ b/debian/patches/1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch @@ -16,11 +16,9 @@ v2: apply correctly on nx-libs 3.6.x (Mihai Moldovan) nx-X11/lib/font/fc/fserve.c | 43 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 8 deletions(-) -diff --git a/nx-X11/lib/font/fc/fsconvert.c b/nx-X11/lib/font/fc/fsconvert.c -index 9a5e194..afa2c32 100644 --- a/nx-X11/lib/font/fc/fsconvert.c +++ b/nx-X11/lib/font/fc/fsconvert.c -@@ -123,6 +123,10 @@ _fs_convert_props(fsPropInfo *pi, fsPropOffset *po, pointer pd, +@@ -123,6 +123,10 @@ _fs_convert_props(fsPropInfo *pi, fsProp for (i = 0; i < nprops; i++, dprop++, is_str++) { memcpy(&local_off, off_adr, SIZEOF(fsPropOffset)); @@ -31,7 +29,7 @@ index 9a5e194..afa2c32 100644 dprop->name = MakeAtom(&pdc[local_off.name.position], local_off.name.length, 1); if (local_off.type != PropTypeString) { -@@ -130,15 +134,20 @@ _fs_convert_props(fsPropInfo *pi, fsPropOffset *po, pointer pd, +@@ -130,15 +134,20 @@ _fs_convert_props(fsPropInfo *pi, fsProp dprop->value = local_off.value.position; } else { *is_str = TRUE; @@ -57,11 +55,9 @@ index 9a5e194..afa2c32 100644 } } off_adr += SIZEOF(fsPropOffset); -diff --git a/nx-X11/lib/font/fc/fserve.c b/nx-X11/lib/font/fc/fserve.c -index 9e652d2..75cabdd 100644 --- a/nx-X11/lib/font/fc/fserve.c +++ b/nx-X11/lib/font/fc/fserve.c -@@ -866,6 +866,7 @@ fs_read_query_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -865,6 +865,7 @@ fs_read_query_info(FontPathElementPtr fp FSFpePtr conn = (FSFpePtr) fpe->private; fsQueryXInfoReply *rep; char *buf; @@ -69,7 +65,7 @@ index 9e652d2..75cabdd 100644 fsPropInfo *pi; fsPropOffset *po; pointer pd; -@@ -896,7 +897,10 @@ fs_read_query_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -895,7 +896,10 @@ fs_read_query_info(FontPathElementPtr fp buf = (char *) rep; buf += SIZEOF(fsQueryXInfoReply); @@ -81,7 +77,7 @@ index 9e652d2..75cabdd 100644 /* move the data over */ fsUnpack_XFontInfoHeader(rep, pInfo); -@@ -904,19 +908,52 @@ fs_read_query_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec) +@@ -903,19 +907,52 @@ fs_read_query_info(FontPathElementPtr fp _fs_init_fontinfo(conn, pInfo); /* Compute offsets into the reply */ @@ -136,6 +132,3 @@ index 9e652d2..75cabdd 100644 if (ret == -1) { fs_cleanup_bfont (bfont); --- -2.1.4 - |