diff options
| author | brettw <brettw@chromium.org> | 2015-08-12 00:31:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-12 07:31:56 +0000 |
| commit | 83dc1610d1a0e3b78909b565943bfa12aeae9370 (patch) | |
| tree | 787766c2e0a7e0345474646efdce63dff9ac5c61 /sandbox/win | |
| parent | a91b4915fd7038c8bbea8b02cd6a8ac5a92bae8a (diff) | |
| download | chromium_src-83dc1610d1a0e3b78909b565943bfa12aeae9370.zip chromium_src-83dc1610d1a0e3b78909b565943bfa12aeae9370.tar.gz chromium_src-83dc1610d1a0e3b78909b565943bfa12aeae9370.tar.bz2 | |
Remove remaining legacy SplitString calls.
TBR=zelidrag@chromium.org (chromeos)
Review URL: https://codereview.chromium.org/1284833004
Cr-Commit-Position: refs/heads/master@{#342983}
Diffstat (limited to 'sandbox/win')
| -rw-r--r-- | sandbox/win/src/named_pipe_dispatcher.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sandbox/win/src/named_pipe_dispatcher.cc b/sandbox/win/src/named_pipe_dispatcher.cc index 6bf982a..53bb7c4 100644 --- a/sandbox/win/src/named_pipe_dispatcher.cc +++ b/sandbox/win/src/named_pipe_dispatcher.cc @@ -56,16 +56,15 @@ bool NamedPipeDispatcher::CreateNamedPipe(IPCInfo* ipc, ipc->return_info.win32_result = ERROR_ACCESS_DENIED; ipc->return_info.handle = INVALID_HANDLE_VALUE; - std::vector<base::string16> paths; - std::vector<base::string16> innerpaths; - base::SplitString(*name, '/', &paths); - - for (std::vector<base::string16>::const_iterator iter = paths.begin(); - iter != paths.end(); ++iter) { - base::SplitString(*iter, '\\', &innerpaths); - for (std::vector<base::string16>::const_iterator iter2 = innerpaths.begin(); - iter2 != innerpaths.end(); ++iter2) { - if (*iter2 == L"..") + base::StringPiece16 dotdot(L".."); + + for (const base::StringPiece16& path : base::SplitStringPiece( + *name, base::string16(1, '/'), + base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) { + for (const base::StringPiece16& inner : base::SplitStringPiece( + path, base::string16(1, '\\'), + base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) { + if (inner == dotdot) return true; } } |