diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 21:58:07 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 21:58:07 +0000 |
| commit | 50c7eb8a256dfbff20f5434f78a3f4f537c4239b (patch) | |
| tree | 7885d55af005204b543f89c911c3e54a9ecf1e70 /chrome/installer/util | |
| parent | c08494af57caf5666d7f721ddf5f0b96d68cb460 (diff) | |
| download | chromium_src-50c7eb8a256dfbff20f5434f78a3f4f537c4239b.zip chromium_src-50c7eb8a256dfbff20f5434f78a3f4f537c4239b.tar.gz chromium_src-50c7eb8a256dfbff20f5434f78a3f4f537c4239b.tar.bz2 | |
Add 64 bit support + code cleanup
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/374022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util')
| -rw-r--r-- | chrome/installer/util/l10n_string_util.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/installer/util/l10n_string_util.cc b/chrome/installer/util/l10n_string_util.cc index 32ac7c4..3269516 100644 --- a/chrome/installer/util/l10n_string_util.cc +++ b/chrome/installer/util/l10n_string_util.cc @@ -232,7 +232,11 @@ std::wstring GetLocalizedEulaResource() { // Spaces and DOS paths must be url encoded. std::wstring url_path = StringPrintf(L"res://%ls/#23/%ls", full_exe_path, resource); - DWORD count = url_path.size() * 3; + + // The cast is safe because url_path has limited length + // (see the definition of full_exe_path and resource). + DCHECK(kuint32max > (url_path.size() * 3)); + DWORD count = static_cast<DWORD>(url_path.size() * 3); scoped_array<wchar_t> url_canon(new wchar_t[count]); HRESULT hr = ::UrlCanonicalizeW(url_path.c_str(), url_canon.get(), &count, URL_ESCAPE_UNSAFE); |