Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: base/files/file_util_win.cc

Issue 2570693002: Fix base::CopyDirectory() and JumpListIcons(Old) folders' operation logic (Closed)
Patch Set: Update comments and fix some nits Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/win/jumplist.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/files/file_util_win.cc
diff --git a/base/files/file_util_win.cc b/base/files/file_util_win.cc
index d70454df3836a7067f71eecf5a0ae8673376f474..7aab5b6505caa6e4fcb5adfa934147be12b184ed 100644
--- a/base/files/file_util_win.cc
+++ b/base/files/file_util_win.cc
@@ -177,9 +177,11 @@ bool CopyDirectory(const FilePath& from_path, const FilePath& to_path,
FilePath real_from_path = MakeAbsoluteFilePath(from_path);
if (real_from_path.empty())
return false;
+ // Note: it's important to use IsParent() here as string comparison would
+ // result
gab 2016/12/14 15:04:23 nit: wrapping
chengx 2016/12/14 19:07:32 Done.
+ // in a false negative on, e.g. C:\bar\Foo versus C:\bar\FooOld.
gab 2016/12/14 15:04:23 s/on, e.g./, e.g. on/
chengx 2016/12/14 19:07:32 Done.
if (real_to_path.value().size() >= real_from_path.value().size() &&
- real_to_path.value().compare(0, real_from_path.value().size(),
- real_from_path.value()) == 0) {
+ real_from_path.IsParent(real_to_path)) {
return false;
}
« no previous file with comments | « no previous file | chrome/browser/win/jumplist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698