File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -6700,17 +6700,17 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
67006700 }
67016701
67026702 if (remove_flag) {
6703- // Shift the remainder of the argv list left by one. Note
6704- // that argv has (*argc + 1) elements, the last one always being
6705- // NULL. The following loop moves the trailing NULL element as
6706- // well.
6707- for (int j = i; j != *argc; j++) {
6708- argv[j] = argv[j + 1 ];
6703+ // Shift the remainder of the argv list left by one.
6704+ for (int j = i + 1 ; j < *argc; ++j) {
6705+ argv[j - 1 ] = argv[j];
67096706 }
67106707
67116708 // Decrements the argument count.
67126709 (*argc)--;
67136710
6711+ // Terminate the array with nullptr.
6712+ argv[*argc] = nullptr ;
6713+
67146714 // We also need to decrement the iterator as we just removed
67156715 // an element.
67166716 i--;
You can’t perform that action at this time.
0 commit comments