From faa687fed273e36ee92ac51d06a94d786084a3b0 Mon Sep 17 00:00:00 2001
From: Apple <opensource@apple.com>
Date: Wed, 29 Mar 2017 19:58:42 +0000
Subject: [PATCH] system_cmds-735.50.6.tar.gz

---
 fs_usage.tproj/fs_usage.c             | 19 +++++++++++--------
 latency.tproj/latency.c               |  4 +++-
 system_cmds.xcodeproj/project.pbxproj | 13 +++++++++++++
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/fs_usage.tproj/fs_usage.c b/fs_usage.tproj/fs_usage.c
index 24ec958..5289421 100644
--- a/fs_usage.tproj/fs_usage.c
+++ b/fs_usage.tproj/fs_usage.c
@@ -43,15 +43,16 @@
 #include <ktrace.h>
 #include <assert.h>
 
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/mman.h>
 #include <sys/disk.h>
-#include <sys/file.h>
 #include <sys/fcntl.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/syslimits.h>
+#include <sys/time.h>
+#include <sys/types.h>
 
 #import <mach/clock_types.h>
 #import <mach/mach_time.h>
@@ -3003,6 +3004,8 @@ fd_set_is_network(pid_t pid, unsigned long fd, bool set)
 
 	if (pid < 0)
 		return;
+	if (fd > OPEN_MAX)
+		return;
 
 	pfs = pfs_get(pid);
 
@@ -3013,7 +3016,7 @@ fd_set_is_network(pid_t pid, unsigned long fd, bool set)
 
 		newsize = MAX((fd + CHAR_BIT) / CHAR_BIT, 2 * pfs->setsize);
 		pfs->set = reallocf(pfs->set, newsize);
-		assert(pfs->set);
+		assert(pfs->set != NULL);
 
 		bzero(pfs->set + pfs->setsize, newsize - pfs->setsize);
 		pfs->setsize = newsize;
diff --git a/latency.tproj/latency.c b/latency.tproj/latency.c
index 8047b2d..b48bc55 100644
--- a/latency.tproj/latency.c
+++ b/latency.tproj/latency.c
@@ -365,6 +365,8 @@ quit(char *s)
 			set_remove();
 		}
 	}
+	endwin();
+
 	printf("latency: ");
 	if (s) {
 		printf("%s", s);
@@ -2583,7 +2585,7 @@ do_kernel_nm(void)
 	/*
 	 * Build the nm command and create a tmp file with the output
 	 */
-	sprintf (tmpstr, "/usr/bin/nm -f -n -s __TEXT __text %s > %s",
+	sprintf (tmpstr, "/usr/bin/nm -n %s -s __TEXT __text > %s",
 		 kernelpath, tmp_nm_file);
 	system(tmpstr);
 
diff --git a/system_cmds.xcodeproj/project.pbxproj b/system_cmds.xcodeproj/project.pbxproj
index de9e5df..4b34aee 100644
--- a/system_cmds.xcodeproj/project.pbxproj
+++ b/system_cmds.xcodeproj/project.pbxproj
@@ -269,6 +269,7 @@
 				BACC1D341377B58A007728F4 /* PBXTargetDependency */,
 				BACC1D361377B58A007728F4 /* PBXTargetDependency */,
 				BACC1D3A1377B58A007728F4 /* PBXTargetDependency */,
+				8E556A4B1D3FF7A40038D48B /* PBXTargetDependency */,
 			);
 			name = All_iOS;
 			productName = All_iOS;
@@ -907,6 +908,13 @@
 			remoteGlobalIDString = 78DE9DDF1B5045DE00FE6DF5;
 			remoteInfo = wait4path;
 		};
+		8E556A4A1D3FF7A40038D48B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = BA2DE9181372FA9100D1913C /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8EC3915B1C9733C2001E28E6;
+			remoteInfo = proc_uuid_policy;
+		};
 		8EC3916D1C973440001E28E6 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BA2DE9181372FA9100D1913C /* Project object */;
@@ -6132,6 +6140,11 @@
 			target = 78DE9DDF1B5045DE00FE6DF5 /* wait4path */;
 			targetProxy = 78DE9DF91B504D1200FE6DF5 /* PBXContainerItemProxy */;
 		};
+		8E556A4B1D3FF7A40038D48B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8EC3915B1C9733C2001E28E6 /* proc_uuid_policy */;
+			targetProxy = 8E556A4A1D3FF7A40038D48B /* PBXContainerItemProxy */;
+		};
 		8EC3916E1C973440001E28E6 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 8EC3915B1C9733C2001E28E6 /* proc_uuid_policy */;
-- 
2.47.2