diff options
| author | Elliott Hughes <enh@google.com> | 2019-02-06 14:28:32 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2019-02-06 14:29:35 -0800 |
| commit | eb0ef145fd38922617e6ab3d94eaacde93e04c95 (patch) | |
| tree | 63a400421b9bc3526032421fce23b8434c84a8d4 /base/mapped_file_test.cpp | |
| parent | a42af36002914dc2efe9589a334c72eb5225d1c5 (diff) | |
| download | system_core-eb0ef145fd38922617e6ab3d94eaacde93e04c95.tar.gz system_core-eb0ef145fd38922617e6ab3d94eaacde93e04c95.tar.bz2 system_core-eb0ef145fd38922617e6ab3d94eaacde93e04c95.zip | |
MappedFile and FileMap should support zero-length mappings.
Bug: http://b/119818070 "app crashes when reading asset of zero length"
Test: ran tests
Change-Id: Idd2ad6f6e72c8e445aff78a460fac96dea41c950
Diffstat (limited to 'base/mapped_file_test.cpp')
| -rw-r--r-- | base/mapped_file_test.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/base/mapped_file_test.cpp b/base/mapped_file_test.cpp index 7e89723c6..cfde73c74 100644 --- a/base/mapped_file_test.cpp +++ b/base/mapped_file_test.cpp @@ -25,7 +25,6 @@ #include <string> #include "android-base/file.h" -#include "android-base/unique_fd.h" TEST(mapped_file, smoke) { TemporaryFile tf; @@ -37,3 +36,13 @@ TEST(mapped_file, smoke) { ASSERT_EQ('l', m->data()[0]); ASSERT_EQ('o', m->data()[1]); } + +TEST(mapped_file, zero_length_mapping) { + // http://b/119818070 "app crashes when reading asset of zero length". + // mmap fails with EINVAL for a zero length region. + TemporaryFile tf; + ASSERT_TRUE(tf.fd != -1); + + auto m = android::base::MappedFile::FromFd(tf.fd, 4096, 0, PROT_READ); + ASSERT_EQ(0u, m->size()); +} |