@@ -661,11 +661,14 @@ ::std::vector<std::string> GetArgvs() {
|
661 | 661 | FilePath GetCurrentExecutableName() { |
662 | 662 | FilePath result; |
663 | 663 | |
| 664 | +auto args = GetArgvs(); |
| 665 | +if (!args.empty()) { |
664 | 666 | #if defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_OS2) |
665 | | - result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe")); |
| 667 | + result.Set(FilePath(args[0]).RemoveExtension("exe")); |
666 | 668 | #else |
667 | | - result.Set(FilePath(GetArgvs()[0])); |
| 669 | + result.Set(FilePath(args[0])); |
668 | 670 | #endif // GTEST_OS_WINDOWS |
| 671 | + } |
669 | 672 | |
670 | 673 | return result.RemoveDirectoryName(); |
671 | 674 | } |
|