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

Side by Side Diff: chrome_elf/blacklist/blacklist.cc

Issue 141683007: Add libsvn_tsvn32.dll to the browser blacklist (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 6 years, 11 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome_elf/blacklist/blacklist.h" 5 #include "chrome_elf/blacklist/blacklist.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "chrome_elf/blacklist/blacklist_interceptions.h" 10 #include "chrome_elf/blacklist/blacklist_interceptions.h"
11 #include "sandbox/win/src/interception_internal.h" 11 #include "sandbox/win/src/interception_internal.h"
12 #include "sandbox/win/src/internal_types.h" 12 #include "sandbox/win/src/internal_types.h"
13 #include "sandbox/win/src/sandbox_utils.h" 13 #include "sandbox/win/src/sandbox_utils.h"
14 #include "sandbox/win/src/service_resolver.h" 14 #include "sandbox/win/src/service_resolver.h"
15 #include "version.h" // NOLINT 15 #include "version.h" // NOLINT
16 16
17 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx 17 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
18 extern "C" IMAGE_DOS_HEADER __ImageBase; 18 extern "C" IMAGE_DOS_HEADER __ImageBase;
19 19
20 namespace blacklist{ 20 namespace blacklist{
21 21
22 const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount] = { 22 const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount] = {
23 L"libsvn_tsvn32.dll",
23 // Keep this null pointer here to mark the end of the list. 24 // Keep this null pointer here to mark the end of the list.
24 NULL, 25 NULL,
25 }; 26 };
26 27
27 const wchar_t kRegistryBeaconPath[] = L"SOFTWARE\\Google\\Chrome\\BLBeacon"; 28 const wchar_t kRegistryBeaconPath[] = L"SOFTWARE\\Google\\Chrome\\BLBeacon";
28 const wchar_t kBeaconVersion[] = L"version"; 29 const wchar_t kBeaconVersion[] = L"version";
29 const wchar_t kBeaconState[] = L"state"; 30 const wchar_t kBeaconState[] = L"state";
30 31
31 } // namespace blacklist 32 } // namespace blacklist
32 33
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 // Mark the thunk storage as executable and prevent any future writes to it. 352 // Mark the thunk storage as executable and prevent any future writes to it.
352 BOOL page_executable = VirtualProtect(&g_thunk_storage, 353 BOOL page_executable = VirtualProtect(&g_thunk_storage,
353 sizeof(g_thunk_storage), 354 sizeof(g_thunk_storage),
354 PAGE_EXECUTE_READ, 355 PAGE_EXECUTE_READ,
355 &old_protect); 356 &old_protect);
356 357
357 return NT_SUCCESS(ret) && page_executable; 358 return NT_SUCCESS(ret) && page_executable;
358 } 359 }
359 360
360 } // namespace blacklist 361 } // namespace blacklist
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698