diff options
| author | KingWeiLiu@gmail.com <KingWeiLiu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 21:03:29 +0000 |
|---|---|---|
| committer | KingWeiLiu@gmail.com <KingWeiLiu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 21:03:29 +0000 |
| commit | d9551eaa68a55f771798771f05ee8a9e88d73b3b (patch) | |
| tree | 9a1d8c4e85fabcba9083e6ea3f87e46b71aba5bb | |
| parent | 1defb9855a6bc4e410173eb817989aff81010193 (diff) | |
| download | chromium_src-d9551eaa68a55f771798771f05ee8a9e88d73b3b.zip chromium_src-d9551eaa68a55f771798771f05ee8a9e88d73b3b.tar.gz chromium_src-d9551eaa68a55f771798771f05ee8a9e88d73b3b.tar.bz2 | |
Fix a bug when zip files in a directory containing locale characters in path.
BUG=248115
TEST=manual testing on windows
Review URL: https://chromiumcodereview.appspot.com/16632007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205634 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | third_party/zlib/google/zip.cc | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -265,3 +265,4 @@ Joseph Gentle <josephg@gmail.com> Paul Lind <paul.lind@imgtec.com> Chaobin Zhang <zhchbin@gmail.com> Code Aurora Forum <*@codeaurora.org> +Jingwei Liu <kingweiliu@gmail.com>
\ No newline at end of file diff --git a/third_party/zlib/google/zip.cc b/third_party/zlib/google/zip.cc index 881c0ca..9e2de0d 100644 --- a/third_party/zlib/google/zip.cc +++ b/third_party/zlib/google/zip.cc @@ -52,7 +52,7 @@ bool AddFileToZip(zipFile zip_file, const base::FilePath& src_dir) { bool AddEntryToZip(zipFile zip_file, const base::FilePath& path, const base::FilePath& root_path) { std::string str_path = - path.AsUTF8Unsafe().substr(root_path.value().length() + 1); + path.AsUTF8Unsafe().substr(root_path.AsUTF8Unsafe().length() + 1); #if defined(OS_WIN) ReplaceSubstringsAfterOffset(&str_path, 0u, "\\", "/"); #endif |