Commit 36881ee4 authored by Brad King's avatar Brad King 💬
Browse files

Merge branch 'ctest_update-memory-problems' into release-3.11

Merge-request: !1893
parents 188c5c2a 27f03355
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "cmCTestGlobalVC.h" #include "cmCTestGlobalVC.h"
#include <iosfwd> #include <iosfwd>
#include <list>
#include <string> #include <string>
#include <vector> #include <vector>
...@@ -70,7 +71,8 @@ private: ...@@ -70,7 +71,8 @@ private:
friend struct Revision; friend struct Revision;
// Info of all the repositories (root, externals and nested ones). // Info of all the repositories (root, externals and nested ones).
std::vector<SVNInfo> Repositories; // Use std::list so the elements don't move in memory.
std::list<SVNInfo> Repositories;
// Pointer to the infos of the root repository. // Pointer to the infos of the root repository.
SVNInfo* RootInfo; SVNInfo* RootInfo;
......
...@@ -550,12 +550,13 @@ std::vector<std::string> cmSystemTools::ParseArguments(const char* command) ...@@ -550,12 +550,13 @@ std::vector<std::string> cmSystemTools::ParseArguments(const char* command)
bool win_path = false; bool win_path = false;
if ((command[0] != '/' && command[1] == ':' && command[2] == '\\') || if (command[0] && command[1] &&
(command[0] == '\"' && command[1] != '/' && command[2] == ':' && ((command[0] != '/' && command[1] == ':' && command[2] == '\\') ||
command[3] == '\\') || (command[0] == '\"' && command[1] != '/' && command[2] == ':' &&
(command[0] == '\'' && command[1] != '/' && command[2] == ':' && command[3] == '\\') ||
command[3] == '\\') || (command[0] == '\'' && command[1] != '/' && command[2] == ':' &&
(command[0] == '\\' && command[1] == '\\')) { command[3] == '\\') ||
(command[0] == '\\' && command[1] == '\\'))) {
win_path = true; win_path = true;
} }
// Split the command into an argv array. // Split the command into an argv array.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment