From owner-svn-ports-all@freebsd.org  Fri Nov  4 15:15:37 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 B1BC0C2EB2E;
 Fri,  4 Nov 2016 15:15:37 +0000 (UTC)
 (envelope-from gahr@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 676B3799;
 Fri,  4 Nov 2016 15:15:37 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA4FFaT5088723;
 Fri, 4 Nov 2016 15:15:36 GMT (envelope-from gahr@FreeBSD.org)
Received: (from gahr@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA4FFasK088721;
 Fri, 4 Nov 2016 15:15:36 GMT (envelope-from gahr@FreeBSD.org)
Message-Id: <201611041515.uA4FFasK088721@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gahr set sender to
 gahr@FreeBSD.org using -f
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Fri, 4 Nov 2016 15:15:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r425331 - in head/lang/tcl85: . 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Nov 2016 15:15:37 -0000

Author: gahr
Date: Fri Nov  4 15:15:36 2016
New Revision: 425331
URL: https://svnweb.freebsd.org/changeset/ports/425331

Log:
  lang/tcl85: fix integer overflow and avoid segfault
  
  PR:		214205
  Submitted by:	gahr

Added:
  head/lang/tcl85/files/patch-bug214205   (contents, props changed)
Modified:
  head/lang/tcl85/Makefile

Modified: head/lang/tcl85/Makefile
==============================================================================
--- head/lang/tcl85/Makefile	Fri Nov  4 15:12:28 2016	(r425330)
+++ head/lang/tcl85/Makefile	Fri Nov  4 15:15:36 2016	(r425331)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.5.19
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	TCLTK/tcl8_5 \
 		SF/tcl/Tcl/${PORTVERSION}

Added: head/lang/tcl85/files/patch-bug214205
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/tcl85/files/patch-bug214205	Fri Nov  4 15:15:36 2016	(r425331)
@@ -0,0 +1,46 @@
+Index: ../generic/tclListObj.c
+==================================================================
+--- ../generic/tclListObj.c
++++ ../generic/tclListObj.c
+@@ -853,12 +853,15 @@
+ 	 */
+ 	count = numElems - first;
+     }
+ 
+     if (objc > LIST_MAX - (numElems - count)) {
+-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+-		"max length of a Tcl list (%d elements) exceeded", LIST_MAX));
++	if (interp != NULL) {
++	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
++		    "max length of a Tcl list (%d elements) exceeded",
++		    LIST_MAX));
++	}
+ 	return TCL_ERROR;
+     }
+     isShared = (listRepPtr->refCount > 1);
+     numRequired = numElems - count + objc; /* Known <= LIST_MAX */
+ 
+
+Index: ../generic/tclListObj.c
+==================================================================
+--- ../generic/tclListObj.c
++++ ../generic/tclListObj.c
+@@ -844,15 +844,12 @@
+     if (first >= numElems) {
+ 	first = numElems;	/* So we'll insert after last element. */
+     }
+     if (count < 0) {
+ 	count = 0;
+-    } else if (numElems < first+count || first+count < 0) {
+-	/*
+-	 * The 'first+count < 0' condition here guards agains integer
+-	 * overflow in determining 'first+count'
+-	 */
++    } else if (first > INT_MAX - count /* Handle integer overflow */
++	    || numElems < first+count) {
+ 	count = numElems - first;
+     }
+ 
+     if (objc > LIST_MAX - (numElems - count)) {
+ 	if (interp != NULL) {
+