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

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

Issue 171153002: Increase Browser Blacklist (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | « 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"datamngr.dll",
24 L"hk.dll",
25 L"lmrn.dll",
23 L"libsvn_tsvn32.dll", 26 L"libsvn_tsvn32.dll",
robertshield 2014/02/18 19:37:00 nit: this list should be alphabetized
csharp 2014/02/18 19:39:34 Done.
24 // Keep this null pointer here to mark the end of the list. 27 // Keep this null pointer here to mark the end of the list.
25 NULL, 28 NULL,
26 }; 29 };
27 30
28 const wchar_t kRegistryBeaconPath[] = L"SOFTWARE\\Google\\Chrome\\BLBeacon"; 31 const wchar_t kRegistryBeaconPath[] = L"SOFTWARE\\Google\\Chrome\\BLBeacon";
29 const wchar_t kBeaconVersion[] = L"version"; 32 const wchar_t kBeaconVersion[] = L"version";
30 const wchar_t kBeaconState[] = L"state"; 33 const wchar_t kBeaconState[] = L"state";
31 34
32 } // namespace blacklist 35 } // namespace blacklist
33 36
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 sizeof(g_thunk_storage), 444 sizeof(g_thunk_storage),
442 PAGE_EXECUTE_READ, 445 PAGE_EXECUTE_READ,
443 &old_protect); 446 &old_protect);
444 447
445 RecordSuccessfulThunkSetup(&key); 448 RecordSuccessfulThunkSetup(&key);
446 449
447 return NT_SUCCESS(ret) && page_executable; 450 return NT_SUCCESS(ret) && page_executable;
448 } 451 }
449 452
450 } // namespace blacklist 453 } // 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