From owner-svn-ports-all@FreeBSD.ORG Wed Apr 30 17:43:51 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3B1C7D8F; Wed, 30 Apr 2014 17:43:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 0E2E31E64; Wed, 30 Apr 2014 17:43:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3UHhoC3054937; Wed, 30 Apr 2014 17:43:50 GMT (envelope-from mi@svn.freebsd.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3UHhoiM054935; Wed, 30 Apr 2014 17:43:50 GMT (envelope-from mi@svn.freebsd.org) Message-Id: <201404301743.s3UHhoiM054935@svn.freebsd.org> From: Mikhail Teterin Date: Wed, 30 Apr 2014 17:43:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352693 - in head/graphics/gdtclft: . files X-SVN-Group: ports-head 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.17 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: Wed, 30 Apr 2014 17:43:51 -0000 Author: mi Date: Wed Apr 30 17:43:50 2014 New Revision: 352693 URL: http://svnweb.freebsd.org/changeset/ports/352693 QAT: https://qat.redports.org/buildarchive/r352693/ Log: Fix-up a bug in the new code, which prevented safe-interpreters from using even the already opened file-handles. Bump PORTREVISION. Reviewed by: John Ellson (upstream maintainer) Modified: head/graphics/gdtclft/Makefile head/graphics/gdtclft/files/patch-improve Modified: head/graphics/gdtclft/Makefile ============================================================================== --- head/graphics/gdtclft/Makefile Wed Apr 30 17:31:29 2014 (r352692) +++ head/graphics/gdtclft/Makefile Wed Apr 30 17:43:50 2014 (r352693) @@ -3,7 +3,7 @@ PORTNAME= Gdtclft PORTVERSION= 2.2.5 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics tcl MASTER_SITES= DISTNAME= ${PORTNAME}${PORTVERSION} Modified: head/graphics/gdtclft/files/patch-improve ============================================================================== --- head/graphics/gdtclft/files/patch-improve Wed Apr 30 17:31:29 2014 (r352692) +++ head/graphics/gdtclft/files/patch-improve Wed Apr 30 17:43:50 2014 (r352693) @@ -302,7 +302,7 @@ Use freely and get yourself a pademelon. + if (2+subcmdVec[subi].subcmds+subcmdVec[subi].ishandle > (unsigned)argc) { Tcl_SetResult(interp, "GD handle(s) not specified", TCL_STATIC); return TCL_ERROR; -@@ -369,12 +392,26 @@ +@@ -369,12 +392,27 @@ subcmdVec[subi].ishandle); argi++) { - if (! gdHandleXlate(interp, gdData->handleTbl, @@ -321,10 +321,11 @@ Use freely and get yourself a pademelon. + if (clientData != NULL && subcmdVec[subi].unsafearg != 0) { + const char *fname = + Tcl_GetString(objv[subcmdVec[subi].unsafearg]); -+ if (!Tcl_IsChannelExisting(fname)) -+ Tcl_AppendResult(interp, "Access to ", fname, -+ " not allowed in safe interpreter", TCL_STATIC); -+ return TCL_ERROR; ++ if (!Tcl_IsChannelExisting(fname)) { ++ Tcl_AppendResult(interp, "Access to ", fname, ++ " not allowed in safe interpreter", TCL_STATIC); ++ return TCL_ERROR; ++ } + } + /* Call the subcommand function. */