From owner-svn-ports-head@freebsd.org  Tue Jan  2 14:45:07 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 F1BC5EA8FA3;
 Tue,  2 Jan 2018 14:45:07 +0000 (UTC)
 (envelope-from jpaetzel@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 BA39C24C1;
 Tue,  2 Jan 2018 14:45:07 +0000 (UTC)
 (envelope-from jpaetzel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w02Ej6Ia095102;
 Tue, 2 Jan 2018 14:45:06 GMT (envelope-from jpaetzel@FreeBSD.org)
Received: (from jpaetzel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w02Ej667095100;
 Tue, 2 Jan 2018 14:45:06 GMT (envelope-from jpaetzel@FreeBSD.org)
Message-Id: <201801021445.w02Ej667095100@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to
 jpaetzel@FreeBSD.org using -f
From: Josh Paetzel <jpaetzel@FreeBSD.org>
Date: Tue, 2 Jan 2018 14:45:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r457864 - in head/emulators/open-vm-tools: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: jpaetzel
X-SVN-Commit-Paths: in head/emulators/open-vm-tools: . files
X-SVN-Commit-Revision: 457864
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Jan 2018 14:45:08 -0000

Author: jpaetzel
Date: Tue Jan  2 14:45:06 2018
New Revision: 457864
URL: https://svnweb.freebsd.org/changeset/ports/457864

Log:
  Fix build with clang 6.0.0
  
  Also avoids an endless loop in practice
  
  PR:	224816
  Submitted by:	dim

Added:
  head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c   (contents, props changed)
Modified:
  head/emulators/open-vm-tools/Makefile

Modified: head/emulators/open-vm-tools/Makefile
==============================================================================
--- head/emulators/open-vm-tools/Makefile	Tue Jan  2 14:44:55 2018	(r457863)
+++ head/emulators/open-vm-tools/Makefile	Tue Jan  2 14:45:06 2018	(r457864)
@@ -4,7 +4,7 @@
 PORTNAME=		open-vm-tools
 PORTVERSION=		${RELEASE_VER}
 DISTVERSIONPREFIX=	stable-
-PORTREVISION=		1
+PORTREVISION=		2
 PORTEPOCH=		2
 CATEGORIES=		emulators
 

Added: head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c	Tue Jan  2 14:45:06 2018	(r457864)
@@ -0,0 +1,29 @@
+--- services/plugins/vix/vixTools.c.orig	2017-12-15 21:11:49 UTC
++++ services/plugins/vix/vixTools.c
+@@ -52,6 +52,7 @@
+ #include <stdarg.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <limits.h>
+ 
+ #ifdef _WIN32
+ #include <WTypes.h>
+@@ -7330,7 +7331,7 @@ VixToolsRunScript(VixCommandRequestHeader *requestMsg,
+          goto abort;
+       }
+    }
+-   for (var = 0; var <= 0xFFFFFFFF; var++) {
++   for (var = 0; ; var++) {
+       free(tempScriptFilePath);
+       tempScriptFilePath = Str_SafeAsprintf(NULL,
+                                             "%s"DIRSEPS"%s%d%s",
+@@ -7372,6 +7373,9 @@ VixToolsRunScript(VixCommandRequestHeader *requestMsg,
+           * deletes it), we should not try 4+ billion times.
+           */
+          break;
++      }
++      if (var == INT_MAX) {
++          break;
+       }
+    }
+    if (fd < 0) {