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

Side by Side Diff: sandbox/src/sidestep_resolver.cc

Issue 179039: Fix issue 8348: unfork pe_image.h / pe_image.cc (Closed)
Patch Set: Removed unittest file and entries in .gyp file, restored #error message Created 11 years, 3 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
« no previous file with comments | « sandbox/src/service_resolver.cc ('k') | sandbox/src/target_process.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/src/sidestep_resolver.h" 5 #include "sandbox/src/sidestep_resolver.h"
6 6
7 #include "sandbox/src/pe_image.h" 7 #include "base/pe_image.h"
8 #include "sandbox/src/sandbox_nt_util.h" 8 #include "sandbox/src/sandbox_nt_util.h"
9 #include "sandbox/src/sidestep/preamble_patcher.h" 9 #include "sandbox/src/sidestep/preamble_patcher.h"
10 10
11 namespace { 11 namespace {
12 12
13 const size_t kSizeOfSidestepStub = sidestep::kMaxPreambleStubSize; 13 const size_t kSizeOfSidestepStub = sidestep::kMaxPreambleStubSize;
14 14
15 struct SidestepThunk { 15 struct SidestepThunk {
16 char sidestep[kSizeOfSidestepStub]; // Storage for the sidestep stub. 16 char sidestep[kSizeOfSidestepStub]; // Storage for the sidestep stub.
17 int internal_thunk; // Dummy member to the beginning of the internal thunk. 17 int internal_thunk; // Dummy member to the beginning of the internal thunk.
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 DCHECK_NT(base); 191 DCHECK_NT(base);
192 DCHECK_NT(return_address); 192 DCHECK_NT(return_address);
193 193
194 PEImage pe(base); 194 PEImage pe(base);
195 if (pe.GetImageSectionFromAddr(return_address)) 195 if (pe.GetImageSectionFromAddr(return_address))
196 return true; 196 return true;
197 return false; 197 return false;
198 } 198 }
199 199
200 } // namespace sandbox 200 } // namespace sandbox
OLDNEW
« no previous file with comments | « sandbox/src/service_resolver.cc ('k') | sandbox/src/target_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698