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
hadow.scm'>log</a><a href='/guix/tree/gnu/system/shadow.scm?id=165e0918da54643bfaf9a6cb6b866f8692e9f8f9'>tree</a><a href='/guix/commit/gnu/system/shadow.scm?id=165e0918da54643bfaf9a6cb6b866f8692e9f8f9'>commit</a><a href='/guix/diff/gnu/system/shadow.scm?id=165e0918da54643bfaf9a6cb6b866f8692e9f8f9'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/system/shadow.scm'>
<input type='hidden' name='id' value='165e0918da54643bfaf9a6cb6b866f8692e9f8f9'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=165e0918da54643bfaf9a6cb6b866f8692e9f8f9'>root</a>/<a href='/guix/log/gnu?id=165e0918da54643bfaf9a6cb6b866f8692e9f8f9'>gnu</a>/<a href='/guix/log/gnu/system?id=165e0918da54643bfaf9a6cb6b866f8692e9f8f9'>system</a>/<a href='/guix/log/gnu/system/shadow.scm?id=165e0918da54643bfaf9a6cb6b866f8692e9f8f9'>shadow.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/system/shadow.scm?id=165e0918da54643bfaf9a6cb6b866f8692e9f8f9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>