diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-02-11 04:05:07 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-02-11 04:05:07 -0500 |
| commit | a7fb29866520d5661e0ac8e47957c91a2a43e11e (patch) | |
| tree | 50a169b022edbb31db49f09809d30dfe8597b862 /gnu/packages/patches/zziplib-CVE-2017-5975.patch | |
| parent | 6730d895d3992f37f35f5351332f51a4be2fda50 (diff) | |
| parent | 31c7002b466c6d09400a95bc15774f232b51ce0b (diff) | |
| download | guix-a7fb29866520d5661e0ac8e47957c91a2a43e11e.tar guix-a7fb29866520d5661e0ac8e47957c91a2a43e11e.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/zziplib-CVE-2017-5975.patch')
| -rw-r--r-- | gnu/packages/patches/zziplib-CVE-2017-5975.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/gnu/packages/patches/zziplib-CVE-2017-5975.patch b/gnu/packages/patches/zziplib-CVE-2017-5975.patch deleted file mode 100644 index fad174b056..0000000000 --- a/gnu/packages/patches/zziplib-CVE-2017-5975.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix CVE-2017-5975: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5975 - -Patch copied from Debian. - -Index: zziplib-0.13.62/zzip/memdisk.c -=================================================================== ---- zziplib-0.13.62.orig/zzip/memdisk.c -+++ zziplib-0.13.62/zzip/memdisk.c -@@ -173,6 +173,8 @@ zzip_mem_entry_new(ZZIP_DISK * disk, ZZI - return 0; /* errno=ENOMEM; */ - ___ struct zzip_file_header *header = - zzip_disk_entry_to_file_header(disk, entry); -+ if (!header) -+ { free(item); return 0; } - /* there is a number of duplicated information in the file header - * or the disk entry block. Theoretically some part may be missing - * that exists in the other, ... but we will prefer the disk entry. -Index: zziplib-0.13.62/zzip/mmapped.c -=================================================================== ---- zziplib-0.13.62.orig/zzip/mmapped.c -+++ zziplib-0.13.62/zzip/mmapped.c -@@ -289,6 +289,8 @@ zzip_disk_entry_to_file_header(ZZIP_DISK - (disk->buffer + zzip_disk_entry_fileoffset(entry)); - if (disk->buffer > file_header || file_header >= disk->endbuf) - return 0; -+ if (ZZIP_GET32(file_header) != ZZIP_FILE_HEADER_MAGIC) -+ return 0; - return (struct zzip_file_header *) file_header; - } - |