diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-10-17 16:47:12 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-10-17 16:47:12 -0400 |
| commit | dcaf70897a0bad38a4638a2905aaa3c46b1f1402 (patch) | |
| tree | 439c42bf27972a628ebc0fef11a63b9130ca19a5 /gnu/packages/patches/freeimage-CVE-2016-5684.patch | |
| parent | bf62b8ff79f9d60136996b8251b6475965cf4994 (diff) | |
| parent | 040b6299d505c034b4960c335434a500ae2f8187 (diff) | |
| download | guix-patches-dcaf70897a0bad38a4638a2905aaa3c46b1f1402.tar guix-patches-dcaf70897a0bad38a4638a2905aaa3c46b1f1402.tar.gz | |
Merge branch 'master' into core-updates
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, 34 insertions, 0 deletions
diff --git a/gnu/packages/patches/freeimage-CVE-2016-5684.patch b/gnu/packages/patches/freeimage-CVE-2016-5684.patch new file mode 100644 index 0000000000..2fc02d7b0d --- /dev/null +++ b/gnu/packages/patches/freeimage-CVE-2016-5684.patch @@ -0,0 +1,34 @@ +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 |