From ad383b274db2696cf2d4bdea9d477c463992f2fc Mon Sep 17 00:00:00 2001
From: Conor Burgess <Burgess.Conor@gmail.com>
Date: Thu, 7 Dec 2017 10:53:13 +0000
Subject: Fix value pointed to by `_NSGetArgc()` on macOS

---
 googletest/src/gtest.cc | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 749e8299..41ed48bb 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -146,6 +146,12 @@
 # define vsnprintf _vsnprintf
 #endif  // GTEST_OS_WINDOWS
 
+#if GTEST_OS_MAC
+# ifndef GTEST_OS_IOS
+#  include <crt_externs.h>
+# endif
+#endif
+
 namespace testing {
 
 using internal::CountIf;
@@ -5341,6 +5347,16 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
     }
   }
 
+// Fix the value of *_NSGetArgc() on macOS, but iff 
+// *_NSGetArgv() == argv
+#if GTEST_OS_MAC
+# ifndef GTEST_OS_IOS
+  if (*_NSGetArgv() == argv) {
+    *_NSGetArgc() = *argc;
+  }
+# endif
+#endif
+
   if (g_help_flag) {
     // We print the help here instead of in RUN_ALL_TESTS(), as the
     // latter may not be called at all if the user is using Google
-- 
cgit v1.2.3