diff options
author | Kei Kebrau <kkebrau@posteo.net> | 2019-01-07 19:36:49 -0500 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-09-25 17:45:39 +0200 |
commit | 8dc3c2a7d5fbe28b6f8ae27788b053be0d87b0b6 (patch) | |
tree | 08b5bd511dca4e77f664c1dba3b00423a16990a9 /gnu/packages/patches/freeimage-CVE-2016-5684.patch | |
parent | 8b9570adc16e62c923d14f1f5ecbc8eb5b89c985 (diff) | |
download | guix-patches-8dc3c2a7d5fbe28b6f8ae27788b053be0d87b0b6.tar guix-patches-8dc3c2a7d5fbe28b6f8ae27788b053be0d87b0b6.tar.gz |
gnu: freeimage: Update to 3.18.0.
* gnu/packages/image.scm (freeimage): Update to 3.18.0.
[source]: Modify snippet to remove the bundled libjxr. Remove obsolete
patches.
[arguments]: Add libjxr include directory to #:make-flags.
[inputs]: Add libjxr.
* gnu/packages/patches/freeimage-CVE-2015-0852.patch,
gnu/packages/patches/freeimage-CVE-2016-5684.patch,
gnu/packages/patches/freeimage-fix-build-with-gcc-5.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Unregister patches.
* gnu/packages/patches/freeimage-unbundle.patch: Update patch.
Signed-off-by: Marius Bakke <mbakke@fastmail.com>
Diffstat (limited to 'gnu/packages/patches/freeimage-CVE-2016-5684.patch')
-rw-r--r-- | gnu/packages/patches/freeimage-CVE-2016-5684.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/gnu/packages/patches/freeimage-CVE-2016-5684.patch b/gnu/packages/patches/freeimage-CVE-2016-5684.patch deleted file mode 100644 index 2fc02d7b0d..0000000000 --- a/gnu/packages/patches/freeimage-CVE-2016-5684.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Debian Science Maintainers - <debian-science-maintainers@lists.alioth.debian.org> -Date: Mon, 10 Oct 2016 08:22:44 +0100 -Subject: CVE-2016-5684 - ---- - Source/FreeImage/PluginXPM.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Source/FreeImage/PluginXPM.cpp b/Source/FreeImage/PluginXPM.cpp -index a698321..cc7bd07 100644 ---- a/Source/FreeImage/PluginXPM.cpp -+++ b/Source/FreeImage/PluginXPM.cpp -@@ -181,6 +181,11 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { - } - free(str); - -+ // check info string -+ if((width <= 0) || (height <= 0) || (colors <= 0) || (cpp <= 0)) { -+ throw "Improperly formed info string"; -+ } -+ - if (colors > 256) { - dib = FreeImage_AllocateHeader(header_only, width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); - } else { -@@ -193,7 +198,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { - FILE_RGBA rgba; - - str = ReadString(io, handle); -- if(!str) -+ if(!str || (strlen(str) < (size_t)cpp)) - throw "Error reading color strings"; - - std::string chrs(str,cpp); //create a string for the color chars using the first cpp chars |