From owner-svn-ports-head@freebsd.org Sun Apr 15 19:12:20 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40DD3F8407C; Sun, 15 Apr 2018 19:12:20 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E876177E56; Sun, 15 Apr 2018 19:12:19 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E36B112FB0; Sun, 15 Apr 2018 19:12:19 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3FJCJCM055861; Sun, 15 Apr 2018 19:12:19 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3FJCJeU055859; Sun, 15 Apr 2018 19:12:19 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201804151912.w3FJCJeU055859@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 15 Apr 2018 19:12:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467404 - in head/graphics/freeimage: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/graphics/freeimage: . files X-SVN-Commit-Revision: 467404 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Apr 2018 19:12:20 -0000 Author: sunpoet Date: Sun Apr 15 19:12:19 2018 New Revision: 467404 URL: https://svnweb.freebsd.org/changeset/ports/467404 Log: Fix CVE-2016-5684 - Bump PORTREVISION for package change Obtained from: https://sourceforge.net/p/freeimage/svn/1735/ https://sourceforge.net/p/freeimage/svn/1740/ Security: 5b1631dc-eafd-11e6-9ac1-a4badb2f4699 MFH: 2018Q2 Added: head/graphics/freeimage/files/patch-Source-FreeImage-PluginXPM.cpp (contents, props changed) Modified: head/graphics/freeimage/Makefile Modified: head/graphics/freeimage/Makefile ============================================================================== --- head/graphics/freeimage/Makefile Sun Apr 15 17:56:25 2018 (r467403) +++ head/graphics/freeimage/Makefile Sun Apr 15 19:12:19 2018 (r467404) @@ -3,7 +3,7 @@ PORTNAME= freeimage PORTVERSION= 3.16.0 -PORTREVISION= 3 +PORTREVISION= 4 # Version 3.17.0 is available, but does not build on i386 (and probably # other 32-bit arches) without some not-quite-trivial patching. If one # decides to update the port, please make sure 32-bit builds are tested! Added: head/graphics/freeimage/files/patch-Source-FreeImage-PluginXPM.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/freeimage/files/patch-Source-FreeImage-PluginXPM.cpp Sun Apr 15 19:12:19 2018 (r467404) @@ -0,0 +1,23 @@ +--- Source/FreeImage/PluginXPM.cpp.orig 2013-11-29 19:29:14 UTC ++++ Source/FreeImage/PluginXPM.cpp +@@ -181,6 +181,11 @@ Load(FreeImageIO *io, fi_handle handle, + } + 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, + 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