svn commit: r459695 - in branches/2018Q1/emulators/open-vm-tools: . files

[Josh Paetzel]

Author: jpaetzel
Date: Mon Jan 22 20:27:01 2018
New Revision: 459695
URL: https://svnweb.freebsd.org/changeset/ports/459695

Log:
  MFH: r457864
  
  Fix build with clang 6.0.0
  
  Also avoids an endless loop in practice
  
  PR:	224816
  Submitted by:	dim
  
  Approved by:	ports-secteam (swills)

Added:
  branches/2018Q1/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c
     - copied unchanged from r457864, head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c
Modified:
  branches/2018Q1/emulators/open-vm-tools/Makefile
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/emulators/open-vm-tools/Makefile
==============================================================================
--- branches/2018Q1/emulators/open-vm-tools/Makefile	Mon Jan 22 20:17:06 2018	(r459694)
+++ branches/2018Q1/emulators/open-vm-tools/Makefile	Mon Jan 22 20:27:01 2018	(r459695)
@@ -4,7 +4,7 @@
 PORTNAME=		open-vm-tools
 PORTVERSION=		${RELEASE_VER}
 DISTVERSIONPREFIX=	stable-
-PORTREVISION=		1
+PORTREVISION=		2
 PORTEPOCH=		2
 CATEGORIES=		emulators
 

Copied: branches/2018Q1/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c (from r457864, head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c	Mon Jan 22 20:27:01 2018	(r459695, copy of r457864, head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c)
@@ -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) {