From owner-svn-ports-all@freebsd.org Thu Oct 26 18:53:44 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A509AE50CA2; Thu, 26 Oct 2017 18:53:44 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 665FA65179; Thu, 26 Oct 2017 18:53:44 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9QIrhUG006421; Thu, 26 Oct 2017 18:53:43 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9QIrhUl006419; Thu, 26 Oct 2017 18:53:43 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201710261853.v9QIrhUl006419@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 26 Oct 2017 18:53:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452939 - in head/graphics/sdl2_image: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics/sdl2_image: . files X-SVN-Commit-Revision: 452939 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Oct 2017 18:53:44 -0000 Author: jbeich Date: Thu Oct 26 18:53:43 2017 New Revision: 452939 URL: https://svnweb.freebsd.org/changeset/ports/452939 Log: graphics/sdl2_image: backport XCF vulnerability fix Obtained from: upstream (SDL_image-2.0.2) Security: CVE-2017-2887 Added: head/graphics/sdl2_image/files/ head/graphics/sdl2_image/files/patch-IMG__xcf.c (contents, props changed) Modified: head/graphics/sdl2_image/Makefile (contents, props changed) Modified: head/graphics/sdl2_image/Makefile ============================================================================== --- head/graphics/sdl2_image/Makefile Thu Oct 26 18:42:11 2017 (r452938) +++ head/graphics/sdl2_image/Makefile Thu Oct 26 18:53:43 2017 (r452939) @@ -2,7 +2,7 @@ PORTNAME= sdl2_image PORTVERSION= 2.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ DISTNAME= SDL2_image-${PORTVERSION} Added: head/graphics/sdl2_image/files/patch-IMG__xcf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/sdl2_image/files/patch-IMG__xcf.c Thu Oct 26 18:53:43 2017 (r452939) @@ -0,0 +1,27 @@ +Fixed security vulnerability in XCF image loader (thanks Yves!) +https://hg.libsdl.org/SDL_image/rev/318484db0705 + +--- IMG_xcf.c.orig 2016-01-03 05:52:28 UTC ++++ IMG_xcf.c +@@ -251,6 +251,7 @@ static Uint32 Swap32 (Uint32 v) { + } + + static void xcf_read_property (SDL_RWops * src, xcf_prop * prop) { ++ Uint32 len; + prop->id = SDL_ReadBE32 (src); + prop->length = SDL_ReadBE32 (src); + +@@ -274,7 +275,12 @@ static void xcf_read_property (SDL_RWops * src, xcf_pr + break; + case PROP_COMPRESSION: + case PROP_COLOR: +- SDL_RWread (src, &prop->data, prop->length, 1); ++ if (prop->length > sizeof(prop->data)) { ++ len = sizeof(prop->data); ++ } else { ++ len = prop->length; ++ } ++ SDL_RWread(src, &prop->data, len, 1); + break; + case PROP_VISIBLE: + prop->data.visible = SDL_ReadBE32 (src);