diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2015-07-17 23:50:08 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-07-17 23:50:08 +0000 |
| commit | d9cf1a1f95171658b5166740e01d9967e947ec95 (patch) | |
| tree | da9f7a5cfffb30e7bb0f35d49d8b9d742312021f /lib/sanitizer_common/sanitizer_procmaps_common.cc | |
| parent | 4d9abb92ba721a5a861e41621c6d71d7fdfdc788 (diff) | |
[Sanitizer] Teach ReadFileToBuffer to distinguish empty file from inaccessible file.
Summary:
This fixes https://code.google.com/p/address-sanitizer/issues/detail?id=399
(sanitizers crash with empty suppression files).
Reviewers: kcc
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D11284
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@242594 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_procmaps_common.cc')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_procmaps_common.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sanitizer_common/sanitizer_procmaps_common.cc b/lib/sanitizer_common/sanitizer_procmaps_common.cc index 2c6ce8e2b..4ddf78632 100644 --- a/lib/sanitizer_common/sanitizer_procmaps_common.cc +++ b/lib/sanitizer_common/sanitizer_procmaps_common.cc @@ -153,8 +153,9 @@ uptr MemoryMappingLayout::DumpListOfModules(LoadedModule *modules, void GetMemoryProfile(fill_profile_f cb, uptr *stats, uptr stats_size) { char *smaps = 0; uptr smaps_cap = 0; - uptr smaps_len = ReadFileToBuffer("/proc/self/smaps", - &smaps, &smaps_cap, 64<<20); + uptr smaps_len = 0; + if (!ReadFileToBuffer("/proc/self/smaps", &smaps, &smaps_cap, &smaps_len)) + return; uptr start = 0; bool file = false; const char *pos = smaps; |