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

Side by Side Diff: sandbox/win/src/service_resolver_64.cc

Issue 13888007: Rewrite scoped_array<T> to scoped_ptr<T[]> in sandbox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sandbox/win/src/service_resolver_32.cc ('k') | sandbox/win/src/service_resolver_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sandbox/win/src/service_resolver.h" 5 #include "sandbox/win/src/service_resolver.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "sandbox/win/src/win_utils.h" 9 #include "sandbox/win/src/win_utils.h"
10 10
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 void* thunk_storage, 90 void* thunk_storage,
91 size_t storage_bytes, 91 size_t storage_bytes,
92 size_t* storage_used) { 92 size_t* storage_used) {
93 NTSTATUS ret = Init(target_module, interceptor_module, target_name, 93 NTSTATUS ret = Init(target_module, interceptor_module, target_name,
94 interceptor_name, interceptor_entry_point, 94 interceptor_name, interceptor_entry_point,
95 thunk_storage, storage_bytes); 95 thunk_storage, storage_bytes);
96 if (!NT_SUCCESS(ret)) 96 if (!NT_SUCCESS(ret))
97 return ret; 97 return ret;
98 98
99 size_t thunk_bytes = GetThunkSize(); 99 size_t thunk_bytes = GetThunkSize();
100 scoped_array<char> thunk_buffer(new char[thunk_bytes]); 100 scoped_ptr<char[]> thunk_buffer(new char[thunk_bytes]);
101 ServiceFullThunk* thunk = reinterpret_cast<ServiceFullThunk*>( 101 ServiceFullThunk* thunk = reinterpret_cast<ServiceFullThunk*>(
102 thunk_buffer.get()); 102 thunk_buffer.get());
103 103
104 if (!IsFunctionAService(&thunk->original)) 104 if (!IsFunctionAService(&thunk->original))
105 return STATUS_UNSUCCESSFUL; 105 return STATUS_UNSUCCESSFUL;
106 106
107 ret = PerformPatch(thunk, thunk_storage); 107 ret = PerformPatch(thunk, thunk_storage);
108 108
109 if (NULL != storage_used) 109 if (NULL != storage_used)
110 *storage_used = thunk_bytes; 110 *storage_used = thunk_bytes;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 NOTREACHED(); 184 NOTREACHED();
185 return false; 185 return false;
186 } 186 }
187 187
188 bool Win2kResolverThunk::IsFunctionAService(void* local_thunk) const { 188 bool Win2kResolverThunk::IsFunctionAService(void* local_thunk) const {
189 NOTREACHED(); 189 NOTREACHED();
190 return false; 190 return false;
191 } 191 }
192 192
193 } // namespace sandbox 193 } // namespace sandbox
OLDNEW
« no previous file with comments | « sandbox/win/src/service_resolver_32.cc ('k') | sandbox/win/src/service_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698