wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dumping of process module list and test it 

I probably broke this a year ago in r243895.

llvm-svn: 277842
This commit is contained in:
Reid Kleckner 2016-08-05 17:55:00 +00:00
parent 14e7f73a0f
commit 628d6b5c81
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler-rt/lib/sanitizer_common/sanitizer_win.cc
View File

@ -334,8 +334,8 @@ void DumpProcessMap() {
InternalScopedBuffer<ModuleInfo> module_infos(num_modules); InternalScopedBuffer<ModuleInfo> module_infos(num_modules);
for (size_t i = 0; i < num_modules; ++i) { for (size_t i = 0; i < num_modules; ++i) {
module_infos[i].filepath = modules[i].full_name(); module_infos[i].filepath = modules[i].full_name();
module_infos[i].base_address = modules[i].base_address(); module_infos[i].base_address = modules[i].ranges().front()->beg;
module_infos[i].end_address = modules[i].ranges().front()->end; module_infos[i].end_address = modules[i].ranges().back()->end;
} }
qsort(module_infos.data(), num_modules, sizeof(ModuleInfo), qsort(module_infos.data(), num_modules, sizeof(ModuleInfo),
CompareModulesBase); CompareModulesBase);

29
compiler-rt/test/asan/TestCases/Windows/shadow_conflict_32.cc Normal file
View File

@ -0,0 +1,29 @@
// Load this DLL at the default 32-bit ASan shadow base, and test how we dump
// the process memory layout.
// REQUIRES: asan-32-bits
//
// RUN: %clang_cl_asan -DBUILD_DLL -LD %s -Fe%t_dll.dll -link -base:0x30000000 -fixed -dynamicbase:no
// RUN: %clang_cl_asan %s -Fe%t.exe -link %t_dll.lib
// RUN: not %run %t.exe 2>&1 | FileCheck %s
#ifndef BUILD_DLL
#include <stdio.h>
extern "C" __declspec(dllimport) int test_function();
int main() {
fprintf(stderr, "should have failed to initialize, DLL got loaded near 0x%p\n",
(void *)&test_function);
}
#else
extern "C" __declspec(dllexport) int test_function() { return 0; }
#endif
// CHECK: =={{[0-9]+}}==Shadow memory range interleaves with an existing memory mapping. ASan cannot proceed correctly. ABORTING.
// CHECK: =={{[0-9]+}}==ASan shadow was supposed to be located in the [0x2fff0000-0x3fffffff] range.
// CHECK: =={{[0-9]+}}==Dumping process modules
// CHECK-DAG: {{0x30000000-0x300.....}} {{.*}}\shadow_conflict_32.cc.tmp_dll.dll
// CHECK-DAG: {{0x........-0x........}} {{.*}}\shadow_conflict_32.cc.tmp.exe
// CHECK-DAG: {{0x........-0x........}} {{.*}}\ntdll.dll