summaryrefslogtreecommitdiff
path: root/lib/sanitizer_common/sanitizer_procmaps_linux.cc
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2015-07-17 23:50:08 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2015-07-17 23:50:08 +0000
commitd9cf1a1f95171658b5166740e01d9967e947ec95 (patch)
treeda9f7a5cfffb30e7bb0f35d49d8b9d742312021f /lib/sanitizer_common/sanitizer_procmaps_linux.cc
parent4d9abb92ba721a5a861e41621c6d71d7fdfdc788 (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_linux.cc')
-rw-r--r--lib/sanitizer_common/sanitizer_procmaps_linux.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sanitizer_common/sanitizer_procmaps_linux.cc b/lib/sanitizer_common/sanitizer_procmaps_linux.cc
index 79ca4dfd8..0e97f9633 100644
--- a/lib/sanitizer_common/sanitizer_procmaps_linux.cc
+++ b/lib/sanitizer_common/sanitizer_procmaps_linux.cc
@@ -18,8 +18,8 @@
namespace __sanitizer {
void ReadProcMaps(ProcSelfMapsBuff *proc_maps) {
- proc_maps->len = ReadFileToBuffer("/proc/self/maps", &proc_maps->data,
- &proc_maps->mmaped_size, 1 << 26);
+ CHECK(ReadFileToBuffer("/proc/self/maps", &proc_maps->data,
+ &proc_maps->mmaped_size, &proc_maps->len));
}
static bool IsOneOf(char c, char c1, char c2) {