loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am: d6b25861d0 am: a5f74a4a80 -s ours am: 3c77ef5326 am: 6cb0d4b2aa am: 781c67bd62 am: 8666246971 am: 9bc88caa31 am: 2542cfdb44 am: ee7deb734d
am: 46dfffdc67
Change-Id: I3a1e3dfa091c3e43c1e73700db6d6c9c686b54ef
diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata
index 57bff7b..577ede6 100644
--- a/libc/zoneinfo/tzdata
+++ b/libc/zoneinfo/tzdata
Binary files differ
diff --git a/tests/sys_prctl_test.cpp b/tests/sys_prctl_test.cpp
index b7c542b..f0ac1c3 100644
--- a/tests/sys_prctl_test.cpp
+++ b/tests/sys_prctl_test.cpp
@@ -41,7 +41,6 @@
std::string file_data;
ASSERT_TRUE(android::base::ReadFileToString("/proc/self/maps", &file_data));
- uintptr_t last_start = 0;
uintptr_t last_end = 0;
std::vector<std::string> lines = android::base::Split(file_data, "\n");
for (size_t i = 0; i < lines.size(); i++) {
@@ -55,7 +54,6 @@
// This will never fail on the first line, so no need to do any special checking.
ASSERT_GE(start, last_end)
<< "Overlapping map detected:\n" << lines[i -1] << '\n' << lines[i] << '\n';
- last_start = start;
last_end = end;
}