diff options
| -rw-r--r-- | chrome/installer/util/l10n_string_util.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/urlmon_url_request.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/utils.cc | 2 | ||||
| -rw-r--r-- | o3d/core/cross/canvas_shader.cc | 2 | ||||
| -rw-r--r-- | sandbox/src/interception.cc | 2 | ||||
| -rw-r--r-- | sandbox/src/interception_unittest.cc | 4 | ||||
| -rw-r--r-- | sandbox/src/service_resolver.cc | 2 | ||||
| -rw-r--r-- | sandbox/src/service_resolver_unittest.cc | 2 | ||||
| -rw-r--r-- | sandbox/src/window.cc | 2 | ||||
| -rw-r--r-- | sandbox/wow_helper/service64_resolver.cc | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/chrome/installer/util/l10n_string_util.cc b/chrome/installer/util/l10n_string_util.cc index 029f4dd..32ac7c4 100644 --- a/chrome/installer/util/l10n_string_util.cc +++ b/chrome/installer/util/l10n_string_util.cc @@ -233,7 +233,7 @@ std::wstring GetLocalizedEulaResource() { std::wstring url_path = StringPrintf(L"res://%ls/#23/%ls", full_exe_path, resource); DWORD count = url_path.size() * 3; - scoped_ptr<wchar_t> url_canon(new wchar_t[count]); + scoped_array<wchar_t> url_canon(new wchar_t[count]); HRESULT hr = ::UrlCanonicalizeW(url_path.c_str(), url_canon.get(), &count, URL_ESCAPE_UNSAFE); if (SUCCEEDED(hr)) diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc index efbb260..4d91607 100644 --- a/chrome_frame/urlmon_url_request.cc +++ b/chrome_frame/urlmon_url_request.cc @@ -367,7 +367,7 @@ STDMETHODIMP UrlmonUrlRequest::OnResponse(DWORD dwResponseCode, InternetGetCookie(url_for_persistent_cookies.c_str(), NULL, NULL, &cookie_size); if (cookie_size) { - scoped_ptr<wchar_t> cookies(new wchar_t[cookie_size + 1]); + scoped_array<wchar_t> cookies(new wchar_t[cookie_size + 1]); if (!InternetGetCookie(url_for_persistent_cookies.c_str(), NULL, cookies.get(), &cookie_size)) { NOTREACHED() << "InternetGetCookie failed. Error: " << GetLastError(); diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 246fa0d..fdcb7c7 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -361,7 +361,7 @@ bool GetModuleVersion(HMODULE module, uint32* high, uint32* low) { if (readonly_resource_data && version_resource_size) { // Copy data as VerQueryValue tries to modify the data. This causes // exceptions and heap corruption errors if debugger is attached. - scoped_ptr<char> data(new char[version_resource_size]); + scoped_array<char> data(new char[version_resource_size]); memcpy(data.get(), readonly_resource_data, version_resource_size); if (data.get()) { VS_FIXEDFILEINFO* ver_info = NULL; diff --git a/o3d/core/cross/canvas_shader.cc b/o3d/core/cross/canvas_shader.cc index dc05e5f..7f55fcb 100644 --- a/o3d/core/cross/canvas_shader.cc +++ b/o3d/core/cross/canvas_shader.cc @@ -103,7 +103,7 @@ SkShader* CanvasLinearGradient::MakeNativeShader() { << " CanvasLinearGradient!"; return NULL; } - scoped_ptr<SkColor> colors(new SkColor[colors_.size()]); + scoped_array<SkColor> colors(new SkColor[colors_.size()]); for (std::vector<Float4>::size_type ii = 0; ii < colors_.size(); ii++) { (colors.get())[ii] = Float4ToSkColor(colors_[ii]); } diff --git a/sandbox/src/interception.cc b/sandbox/src/interception.cc index f75fa3a..81657aa 100644 --- a/sandbox/src/interception.cc +++ b/sandbox/src/interception.cc @@ -89,7 +89,7 @@ bool InterceptionManager::InitializeInterceptions() { return true; // Nothing to do here size_t buffer_bytes = GetBufferSize(); - scoped_ptr<char> local_buffer(new char[buffer_bytes]); + scoped_array<char> local_buffer(new char[buffer_bytes]); if (!SetupConfigBuffer(local_buffer.get(), buffer_bytes)) return false; diff --git a/sandbox/src/interception_unittest.cc b/sandbox/src/interception_unittest.cc index 92e72c1..1c6838e 100644 --- a/sandbox/src/interception_unittest.cc +++ b/sandbox/src/interception_unittest.cc @@ -127,7 +127,7 @@ TEST(InterceptionManagerTest, BufferLayout1) { ASSERT_EQ(18, interceptions.interceptions_.size()); size_t buffer_size = interceptions.GetBufferSize(); - scoped_ptr<BYTE> local_buffer(new BYTE[buffer_size]); + scoped_array<BYTE> local_buffer(new BYTE[buffer_size]); ASSERT_TRUE(interceptions.SetupConfigBuffer(local_buffer.get(), buffer_size)); @@ -179,7 +179,7 @@ TEST(InterceptionManagerTest, BufferLayout2) { ASSERT_EQ(5, interceptions.interceptions_.size()); size_t buffer_size = interceptions.GetBufferSize(); - scoped_ptr<BYTE> local_buffer(new BYTE[buffer_size]); + scoped_array<BYTE> local_buffer(new BYTE[buffer_size]); ASSERT_TRUE(interceptions.SetupConfigBuffer(local_buffer.get(), buffer_size)); diff --git a/sandbox/src/service_resolver.cc b/sandbox/src/service_resolver.cc index 2fae55a..9cdd824 100644 --- a/sandbox/src/service_resolver.cc +++ b/sandbox/src/service_resolver.cc @@ -147,7 +147,7 @@ NTSTATUS ServiceResolverThunk::Setup(const void* target_module, return ret; size_t thunk_bytes = GetThunkSize(); - scoped_ptr<char> thunk_buffer(new char[thunk_bytes]); + scoped_array<char> thunk_buffer(new char[thunk_bytes]); ServiceFullThunk* thunk = reinterpret_cast<ServiceFullThunk*>( thunk_buffer.get()); diff --git a/sandbox/src/service_resolver_unittest.cc b/sandbox/src/service_resolver_unittest.cc index 6f7da8e..3af81f2 100644 --- a/sandbox/src/service_resolver_unittest.cc +++ b/sandbox/src/service_resolver_unittest.cc @@ -85,7 +85,7 @@ NTSTATUS PatchNtdll(const char* function, bool relaxed) { // Any pointer will do as an interception_entry_point void* function_entry = resolver; size_t thunk_size = resolver->GetThunkSize(); - scoped_ptr<char> thunk(new char[thunk_size]); + scoped_array<char> thunk(new char[thunk_size]); uint32 used; NTSTATUS ret = resolver->Setup(ntdll_base, NULL, function, NULL, diff --git a/sandbox/src/window.cc b/sandbox/src/window.cc index cd6022c..bc3b777 100644 --- a/sandbox/src/window.cc +++ b/sandbox/src/window.cc @@ -111,7 +111,7 @@ std::wstring GetWindowObjectName(HANDLE handle) { } // Create the buffer that will hold the name. - scoped_ptr<wchar_t> name_buffer(new wchar_t[size]); + scoped_array<wchar_t> name_buffer(new wchar_t[size]); // Query the name of the object. if (!::GetUserObjectInformation(handle, UOI_NAME, name_buffer.get(), size, diff --git a/sandbox/wow_helper/service64_resolver.cc b/sandbox/wow_helper/service64_resolver.cc index 8e6f8d9..2feb237 100644 --- a/sandbox/wow_helper/service64_resolver.cc +++ b/sandbox/wow_helper/service64_resolver.cc @@ -210,7 +210,7 @@ NTSTATUS Service64ResolverThunk::Setup(const void* target_module, return ret; size_t thunk_bytes = GetThunkSize(); - scoped_ptr<char> thunk_buffer(new char[thunk_bytes]); + scoped_array<char> thunk_buffer(new char[thunk_bytes]); ServiceFullThunk* thunk = reinterpret_cast<ServiceFullThunk*>( thunk_buffer.get()); |