summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-03-20 06:57:09 +0100
committerMarius Bakke <mbakke@fastmail.com>2017-03-20 23:35:39 +0100
commit38190ea5efa33ff91f6764149591b8939be0b932 (patch)
tree879036249759b1de783ab7c825f429877b5a0192 /gnu/packages/patches
parentf69e20341f7bdf21e48893afa6422aab46e46c8a (diff)
downloadguix-patches-38190ea5efa33ff91f6764149591b8939be0b932.tar
guix-patches-38190ea5efa33ff91f6764149591b8939be0b932.tar.gz
gnu: vim: Update to 8.0.0494.
* gnu/packages/patches/vim-CVE-2017-5953.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/vim.scm (vim, vim-full): Update to 8.0.0494. [source]: Remove patch. (vim-full)[arguments]: Add two phases to drop tests and start xorg. [native-inputs]: Add XORG-SERVER.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/vim-CVE-2017-5953.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/gnu/packages/patches/vim-CVE-2017-5953.patch b/gnu/packages/patches/vim-CVE-2017-5953.patch
deleted file mode 100644
index 070f98c2cb..0000000000
--- a/gnu/packages/patches/vim-CVE-2017-5953.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix CVE-2017-5953:
-
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5953
-https://groups.google.com/forum/#!topic/vim_dev/t-3RSdEnrHY
-
-This change is adapted from the upstream source repository:
-
-https://github.com/vim/vim/commit/6d3c8586fc81b022e9f06c611b9926108fb878c7
-
-diff --git a/src/spellfile.c b/src/spellfile.c
-index c7d87c6..00ef019 100644
---- a/src/spellfile.c
-+++ b/src/spellfile.c
-@@ -1585,7 +1585,7 @@ spell_read_tree(
- int prefixtree, /* TRUE for the prefix tree */
- int prefixcnt) /* when "prefixtree" is TRUE: prefix count */
- {
-- int len;
-+ long len;
- int idx;
- char_u *bp;
- idx_T *ip;
-@@ -1595,6 +1595,9 @@ spell_read_tree(
- len = get4c(fd);
- if (len < 0)
- return SP_TRUNCERROR;
-+ if (len >= LONG_MAX / (long)sizeof(int))
-+ /* Invalid length, multiply with sizeof(int) would overflow. */
-+ return SP_FORMERROR;
- if (len > 0)
- {
- /* Allocate the byte array. */