From owner-svn-ports-all@freebsd.org Thu Oct 26 19:04:43 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 600B5E50FA3; Thu, 26 Oct 2017 19:04:43 +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 2D3096584A; Thu, 26 Oct 2017 19:04:43 +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 v9QJ4gnB011008; Thu, 26 Oct 2017 19:04:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9QJ4goH011006; Thu, 26 Oct 2017 19:04:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201710261904.v9QJ4goH011006@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 19:04:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452943 - in head/graphics/sdl_image: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics/sdl_image: . files X-SVN-Commit-Revision: 452943 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 19:04:43 -0000 Author: jbeich Date: Thu Oct 26 19:04:42 2017 New Revision: 452943 URL: https://svnweb.freebsd.org/changeset/ports/452943 Log: graphics/sdl_image: backport XCF vulnerability fix Obtained from: upstream (SDL_image-2.0.2) Security: CVE-2017-2887 Tested by: Debian Added: head/graphics/sdl_image/files/ head/graphics/sdl_image/files/patch-IMG__xcf.c (contents, props changed) Modified: head/graphics/sdl_image/Makefile (contents, props changed) Modified: head/graphics/sdl_image/Makefile ============================================================================== --- head/graphics/sdl_image/Makefile Thu Oct 26 18:59:09 2017 (r452942) +++ head/graphics/sdl_image/Makefile Thu Oct 26 19:04:42 2017 (r452943) @@ -3,7 +3,7 @@ PORTNAME= sdl_image PORTVERSION= 1.2.12 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ DISTNAME= SDL_image-${PORTVERSION} Added: head/graphics/sdl_image/files/patch-IMG__xcf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/sdl_image/files/patch-IMG__xcf.c Thu Oct 26 19:04:42 2017 (r452943) @@ -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 2012-01-21 01:51:33 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);