Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure library file starts with 'lib/' prefix."

Browse Source
This commit is contained in:
Iurii Makhno
2023-02-28 23:47:07 +00:00
committed by Android (Google) Code Review
parent f00e5d0002 a30d8baff4
commit 79c38fab27
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/androidfw/ApkParsing.cpp
View File

@@ -56,6 +56,11 @@ const char* ValidLibraryPathLastSlash(const char* fileName, bool suppress64Bit,
return nullptr;
}
// Make sure file starts with 'lib/' prefix.
if (strncmp(fileName, APK_LIB.data(), APK_LIB_LEN) != 0) {
return nullptr;
}
// Make sure there aren't subdirectories by checking if the next / after lib/ is the last slash
if (memchr(fileName + APK_LIB_LEN, '/', fileNameLen - APK_LIB_LEN) != lastSlash) {
return nullptr;

6
libs/androidfw/tests/ApkParsing_test.cpp
View File

@@ -74,4 +74,10 @@ TEST(ApkParsingTest, InvalidFileAtRoot) {
auto lastSlash = util::ValidLibraryPathLastSlash(path, false, false);
ASSERT_THAT(lastSlash, IsNull());
}
TEST(ApkParsingTest, InvalidPrefix) {
const char* path = "assets/libhello.so";
auto lastSlash = util::ValidLibraryPathLastSlash(path, false, false);
ASSERT_THAT(lastSlash, IsNull());
}
}